* [PATCH 1/2] searchidx: move git_unquote to PublicInbox::Git
2019-01-13 8:52 5% [PATCH 0/2] minor prep for diff viewing enhancements Eric Wong
@ 2019-01-13 8:52 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-13 8:52 UTC (permalink / raw)
To: meta
We'll be using it outside of searchidx...
---
lib/PublicInbox/Git.pm | 22 ++++++++++++++++++++++
lib/PublicInbox/SearchIdx.pm | 21 +--------------------
2 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 1611727..8d3f87d 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -12,6 +12,28 @@ use warnings;
use POSIX qw(dup2);
require IO::Handle;
use PublicInbox::Spawn qw(spawn popen_rd);
+use base qw(Exporter);
+our @EXPORT_OK = qw(git_unquote);
+
+my %GIT_ESC = (
+ a => "\a",
+ b => "\b",
+ f => "\f",
+ n => "\n",
+ r => "\r",
+ t => "\t",
+ v => "\013",
+);
+
+# unquote pathnames used by git, see quote.c::unquote_c_style.c in git.git
+sub git_unquote ($) {
+ my ($s) = @_;
+ return $s unless ($s =~ /\A"(.*)"\z/);
+ $s = $1;
+ $s =~ s/\\([abfnrtv])/$GIT_ESC{$1}/g;
+ $s =~ s/\\([0-7]{1,3})/chr(oct($1))/ge;
+ $s;
+}
sub new {
my ($class, $git_dir) = @_;
diff --git a/lib/PublicInbox/SearchIdx.pm b/lib/PublicInbox/SearchIdx.pm
index 8810fe7..db0495b 100644
--- a/lib/PublicInbox/SearchIdx.pm
+++ b/lib/PublicInbox/SearchIdx.pm
@@ -18,7 +18,7 @@ use Carp qw(croak);
use POSIX qw(strftime);
use PublicInbox::OverIdx;
use PublicInbox::Spawn qw(spawn);
-require PublicInbox::Git;
+use PublicInbox::Git qw(git_unquote);
use Compress::Zlib qw(compress);
use constant {
@@ -29,25 +29,6 @@ use constant {
my $xapianlevels = qr/\A(?:full|medium)\z/;
-my %GIT_ESC = (
- a => "\a",
- b => "\b",
- f => "\f",
- n => "\n",
- r => "\r",
- t => "\t",
- v => "\013",
-);
-
-sub git_unquote ($) {
- my ($s) = @_;
- return $s unless ($s =~ /\A"(.*)"\z/);
- $s = $1;
- $s =~ s/\\([abfnrtv])/$GIT_ESC{$1}/g;
- $s =~ s/\\([0-7]{1,3})/chr(oct($1))/ge;
- $s;
-}
-
sub new {
my ($class, $ibx, $creat, $part) = @_;
my $levels = qr/\A(?:full|medium|basic)\z/;
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 0/2] minor prep for diff viewing enhancements
@ 2019-01-13 8:52 5% Eric Wong
2019-01-13 8:52 7% ` [PATCH 1/2] searchidx: move git_unquote to PublicInbox::Git Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-13 8:52 UTC (permalink / raw)
To: meta
Eric Wong (2):
searchidx: move git_unquote to PublicInbox::Git
git_unquote: perform modifications in-place
lib/PublicInbox/Git.pm | 21 +++++++++++++++++++++
lib/PublicInbox/SearchIdx.pm | 21 +--------------------
t/git.t | 4 ++++
3 files changed, 26 insertions(+), 20 deletions(-)
^ permalink raw reply [relevance 5%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-13 8:52 5% [PATCH 0/2] minor prep for diff viewing enhancements Eric Wong
2019-01-13 8:52 7% ` [PATCH 1/2] searchidx: move git_unquote to PublicInbox::Git Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).