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 fdfe126932038fba455ef09e7a9789a8f0796b60..e557f6d62631c68dff1cee535dc962452bab718a 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2014-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2014-2021 all contributors <meta@public-inbox.org>
 # License: GPLv2 or later <https://www.gnu.org/licenses/gpl-2.0.txt>
 #
 # Used to read files from a git repository without excessive forking.
@@ -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];
@@ -126,6 +125,7 @@ sub _bidi_pipe {
        }
        my ($in_r, $p) = popen_rd(\@cmd, undef, $redir);
        $self->{$pid} = $p;
+       $self->{"$pid.owner"} = $$;
        $out_w->autoflush(1);
        if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ
                fcntl($out_w, 1031, 4096);
@@ -239,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 ($$) {
@@ -327,7 +326,7 @@ sub _destroy {
 
        # GitAsyncCat::event_step may delete {pid}
        my $p = delete $self->{$pid} or return;
-       dwaitpid $p;
+       dwaitpid($p) if $$ == $self->{"$pid.owner"};
 }
 
 sub cat_async_abort ($) {
@@ -351,17 +350,35 @@ sub fail { # may be augmented in subclasses
        croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg");
 }
 
+# $git->popen(qw(show f00)); # or
+# $git->popen(qw(show f00), { GIT_CONFIG => ... }, { 2 => ... });
 sub popen {
-       my ($self, @cmd) = @_;
-       @cmd = ('git', "--git-dir=$self->{git_dir}", @cmd);
-       popen_rd(\@cmd);
+       my ($self, $cmd) = splice(@_, 0, 2);
+       $cmd = [ 'git', "--git-dir=$self->{git_dir}",
+               ref($cmd) ? @$cmd : ($cmd, grep { defined && !ref } @_) ];
+       popen_rd($cmd, grep { !defined || ref } @_); # env and opt
 }
 
+# same args as popen above
 sub qx {
-       my ($self, @cmd) = @_;
-       my $fh = $self->popen(@cmd);
-       local $/ = wantarray ? "\n" : undef;
-       <$fh>;
+       my $fh = popen(@_);
+       if (wantarray) {
+               my @ret = <$fh>;
+               close $fh; # caller should check $?
+               @ret;
+       } else {
+               local $/;
+               my $ret = <$fh>;
+               close $fh; # caller should check $?
+               $ret;
+       }
+}
+
+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
@@ -408,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;
 }
@@ -449,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) = @_;
 
@@ -493,14 +496,13 @@ sub modified ($) {
 # templates/this--description in git.git
 sub manifest_entry {
        my ($self, $epoch, $default_desc) = @_;
-       my ($fh, $pid) = $self->popen('show-ref');
+       my $fh = $self->popen('show-ref');
        my $dig = Digest::SHA->new(1);
        while (read($fh, my $buf, 65536)) {
                $dig->add($buf);
        }
-       close $fh;
-       waitpid($pid, 0);
-       return if $?; # empty, uninitialized git repo
+       close $fh or return; # empty, uninitialized git repo
+       undef $fh; # for open, below
        my $git_dir = $self->{git_dir};
        my $ent = {
                fingerprint => $dig->hexdigest,