git: simplify local_nick, avoid "foo.git.git"

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 7c08be47bbe4ac74e9f77349cd81046441d697a5..374a3b4dd71d9849aea7a1c7dee2e8d2e2d8d1f6 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -19,7 +19,7 @@ use Time::HiRes qw(stat);
 use PublicInbox::Spawn qw(popen_rd spawn);
 use PublicInbox::Tmpfile;
 use IO::Poll qw(POLLIN);
-use Carp qw(croak);
+use Carp qw(croak carp);
 use Digest::SHA ();
 use PublicInbox::DS qw(dwaitpid);
 our @EXPORT_OK = qw(git_unquote git_quote);
@@ -114,7 +114,7 @@ sub _bidi_pipe {
                return;
        }
        pipe(my ($out_r, $out_w)) or $self->fail("pipe failed: $!");
-       my $rdr = { 0 => $out_r };
+       my $rdr = { 0 => $out_r, pgid => 0 };
        my $gd = $self->{git_dir};
        if ($gd =~ s!/([^/]+/[^/]+)\z!/!) {
                $rdr->{-C} = $gd;
@@ -179,8 +179,8 @@ sub my_readline ($$) {
        }
 }
 
-sub cat_async_retry ($$$$$) {
-       my ($self, $inflight, $req, $cb, $arg) = @_;
+sub cat_async_retry ($$) {
+       my ($self, $inflight) = @_;
 
        # {inflight} may be non-existent, but if it isn't we delete it
        # here to prevent cleanup() from waiting:
@@ -189,12 +189,13 @@ sub cat_async_retry ($$$$$) {
 
        $self->{inflight} = $inflight;
        batch_prepare($self);
-       my $buf = "$req\n";
+       my $buf = '';
        for (my $i = 0; $i < @$inflight; $i += 3) {
                $buf .= "$inflight->[$i]\n";
        }
        print { $self->{out} } $buf or $self->fail("write error: $!");
-       unshift(@$inflight, \$req, $cb, $arg); # \$ref to indicate retried
+       my $req = shift @$inflight;
+       unshift(@$inflight, \$req); # \$ref to indicate retried
 
        cat_async_step($self, $inflight); # take one step
 }
@@ -202,7 +203,7 @@ sub cat_async_retry ($$$$$) {
 sub cat_async_step ($$) {
        my ($self, $inflight) = @_;
        die 'BUG: inflight empty or odd' if scalar(@$inflight) < 3;
-       my ($req, $cb, $arg) = splice(@$inflight, 0, 3);
+       my ($req, $cb, $arg) = @$inflight[0, 1, 2];
        my $rbuf = delete($self->{rbuf}) // \(my $new = '');
        my ($bref, $oid, $type, $size);
        my $head = my_readline($self->{in}, $rbuf);
@@ -217,8 +218,7 @@ sub cat_async_step ($$) {
                # ref($req) indicates it's already been retried
                # -gcf2 retries internally, so it never hits this path:
                if (!ref($req) && !$in_cleanup && $self->alternates_changed) {
-                       return cat_async_retry($self, $inflight,
-                                               $req, $cb, $arg);
+                       return cat_async_retry($self, $inflight);
                }
                $type = 'missing';
                $oid = ref($req) ? $$req : $req if $oid eq '';
@@ -227,8 +227,9 @@ sub cat_async_step ($$) {
                $self->fail("bad result from async cat-file: $head$err");
        }
        $self->{rbuf} = $rbuf if $$rbuf ne '';
+       splice(@$inflight, 0, 3); # don't retry $cb on ->fail
        eval { $cb->($bref, $oid, $type, $size, $arg) };
-       async_err($self, "E: cat $req ($oid) $@") if $@;
+       async_err($self, $req, $oid, $@, 'cat') if $@;
 }
 
 sub cat_async_wait ($) {
@@ -259,7 +260,7 @@ sub cat_file {
 sub check_async_step ($$) {
        my ($self, $inflight_c) = @_;
        die 'BUG: inflight empty or odd' if scalar(@$inflight_c) < 3;
-       my ($req, $cb, $arg) = splice(@$inflight_c, 0, 3);
+       my ($req, $cb, $arg) = @$inflight_c[0, 1, 2];
        my $rbuf = delete($self->{rbuf_c}) // \(my $new = '');
        chomp(my $line = my_readline($self->{in_c}, $rbuf));
        my ($hex, $type, $size) = split(/ /, $line);
@@ -273,8 +274,9 @@ sub check_async_step ($$) {
                $self->fail(defined($ret) ? 'read EOF' : "read: $!") if !$ret;
        }
        $self->{rbuf_c} = $rbuf if $$rbuf ne '';
+       splice(@$inflight_c, 0, 3); # don't retry $cb on ->fail
        eval { $cb->($hex, $type, $size, $arg, $self) };
-       async_err($self, "E: check $req ($hex) $@") if $@;
+       async_err($self, $req, $hex, $@, 'check') if $@;
 }
 
 sub check_async_wait ($) {
@@ -342,6 +344,7 @@ sub async_abort ($) {
                        my $q = $self->{"inflight$c"};
                        while (@$q) {
                                my ($req, $cb, $arg) = splice(@$q, 0, 3);
+                               $req = $$req if ref($req);
                                $req =~ s/ .*//; # drop git_dir for Gcf2Client
                                eval { $cb->(undef, $req, undef, undef, $arg) };
                                warn "E: (in abort) $req: $@" if $@;
@@ -359,10 +362,11 @@ sub fail { # may be augmented in subclasses
        croak(ref($self) . ' ' . ($self->{git_dir} // '') . ": $msg");
 }
 
-sub async_err ($$) {
-       my ($self, $msg) = @_;
-       return warn($msg) if $async_warn;
-       $self->fail($msg);
+sub async_err ($$$$$) {
+       my ($self, $req, $oid, $err, $action) = @_;
+       $req = $$req if ref($req); # retried
+       my $msg = "E: $action $req ($oid): $err";
+       $async_warn ? carp($msg) : $self->fail($msg);
 }
 
 # $git->popen(qw(show f00)); # or
@@ -438,13 +442,8 @@ sub packed_bytes {
 sub DESTROY { cleanup(@_) }
 
 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 = "$1.git";
-       }
-       wantarray ? ($ret) : $ret;
+       $_[0]->{git_dir} =~ m!/([^/]+?)(?:/*\.git/*)?\z! ? "$1.git" : '???';
 }
 
 sub host_prefix_url ($$) {
@@ -461,7 +460,7 @@ sub pub_urls {
        if (my $urls = $self->{cgit_url}) {
                return map { host_prefix_url($env, $_) } @$urls;
        }
-       local_nick($self);
+       (local_nick($self));
 }
 
 sub cat_async_begin {