get rid of unnecessary bytes::length usage

[public-inbox.git] / lib / PublicInbox / Git.pm

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 3d97300c43c3f0fca345d6719d925d3b9ad652eb..e557f6d62631c68dff1cee535dc962452bab718a 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -50,14 +50,13 @@ my %ESC_GIT = map { $GIT_ESC{$_} => $_ } keys %GIT_ESC;
 sub git_unquote ($) {
        return $_[0] unless ($_[0] =~ /\A"(.*)"\z/);
        $_[0] = $1;
-       $_[0] =~ s/\\([\\"abfnrtv])/$GIT_ESC{$1}/g;
-       $_[0] =~ s/\\([0-7]{1,3})/chr(oct($1))/ge;
+       $_[0] =~ s!\\([\\"abfnrtv]|[0-3][0-7]{2})!$GIT_ESC{$1}//chr(oct($1))!ge;
        $_[0];
 }
 
 sub git_quote ($) {
        if ($_[0] =~ s/([\\"\a\b\f\n\r\t\013]|[^[:print:]])/
-                     '\\'.($ESC_GIT{$1}||sprintf("%0o",ord($1)))/egs) {
+                     '\\'.($ESC_GIT{$1}||sprintf("%03o",ord($1)))/egs) {
                return qq{"$_[0]"};
        }
        $_[0];
@@ -240,17 +239,16 @@ sub batch_prepare ($) {
 }
 
 sub _cat_file_cb {
-       my ($bref, undef, undef, $size, $result) = @_;
-       @$result = ($bref, $size);
+       my ($bref, $oid, $type, $size, $result) = @_;
+       @$result = ($bref, $oid, $type, $size);
 }
 
 sub cat_file {
-       my ($self, $oid, $sizeref) = @_;
+       my ($self, $oid) = @_;
        my $result = [];
        cat_async($self, $oid, \&_cat_file_cb, $result);
        cat_async_wait($self);
-       $$sizeref = $result->[1] if $sizeref;
-       $result->[0];
+       wantarray ? @$result : $result->[0];
 }
 
 sub check_async_step ($$) {
@@ -363,10 +361,8 @@ sub popen {
 
 # same args as popen above
 sub qx {
-       my $self = shift;
-       my $fh = $self->popen(@_);
+       my $fh = popen(@_);
        if (wantarray) {
-               local $/ = "\n";
                my @ret = <$fh>;
                close $fh; # caller should check $?
                @ret;
@@ -378,6 +374,13 @@ sub qx {
        }
 }
 
+sub date_parse {
+       my $self = shift;
+       map {
+               substr($_, length('--max-age='), -1)
+       } $self->qx('rev-parse', map { "--since=$_" } @_);
+}
+
 # check_async and cat_async may trigger the other, so ensure they're
 # both completely done by using this:
 sub async_wait_all ($) {
@@ -422,8 +425,8 @@ sub local_nick ($) {
        my ($self) = @_;
        my $ret = '???';
        # don't show full FS path, basename should be OK:
-       if ($self->{git_dir} =~ m!/([^/]+)(?:/\.git)?\z!) {
-               $ret = "/path/to/$1";
+       if ($self->{git_dir} =~ m!/([^/]+)(?:/*\.git/*)?\z!) {
+               $ret = "$1.git";
        }
        wantarray ? ($ret) : $ret;
 }
@@ -463,20 +466,6 @@ sub cat_async ($$$;$) {
        push(@$inflight, $oid, $cb, $arg);
 }
 
-sub async_prefetch {
-       my ($self, $oid, $cb, $arg) = @_;
-       if (my $inflight = $self->{inflight}) {
-               # we could use MAX_INFLIGHT here w/o the halving,
-               # but lets not allow one client to monopolize a git process
-               if (scalar(@$inflight) < int(MAX_INFLIGHT/2)) {
-                       print { $self->{out} } $oid, "\n" or
-                                               $self->fail("write error: $!");
-                       return push(@$inflight, $oid, $cb, $arg);
-               }
-       }
-       undef;
-}
-
 sub extract_cmt_time {
        my ($bref, undef, undef, undef, $modified) = @_;