nntpd: remove redundant {groups} shortcut

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index eb5de159d2e6db16122c43b7c665f62c6d39e754..917fa4a16e96b76a4a45ebd560035a4bac1b78a4 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -14,10 +14,12 @@ use POSIX ();
 use IO::Handle; # ->autoflush
 use Errno qw(EINTR);
 use File::Glob qw(bsd_glob GLOB_NOSORT);
+use File::Spec ();
 use Time::HiRes qw(stat);
 use PublicInbox::Spawn qw(popen_rd);
 use PublicInbox::Tmpfile;
 use Carp qw(croak);
+use Digest::SHA ();
 our @EXPORT_OK = qw(git_unquote git_quote);
 our $PIPE_BUFSIZ = 65536; # Linux default
 our $in_cleanup;
@@ -275,7 +277,7 @@ sub check_async_begin ($) {
 sub check_async ($$$$) {
        my ($self, $oid, $cb, $arg) = @_;
        my $inflight_c = $self->{inflight_c} // check_async_begin($self);
-       if (scalar(@$inflight_c) >= MAX_INFLIGHT) {
+       while (scalar(@$inflight_c) >= MAX_INFLIGHT) {
                check_async_step($self, $inflight_c);
        }
        print { $self->{out_c} } $oid, "\n" or fail($self, "write error: $!");
@@ -352,13 +354,23 @@ sub qx {
        <$fh>
 }
 
+# check_async and cat_async may trigger the other, so ensure they're
+# both completely done by using this:
+sub async_wait_all ($) {
+       my ($self) = @_;
+       while (scalar(@{$self->{inflight_c} // []}) ||
+                       scalar(@{$self->{inflight} // []})) {
+               $self->check_async_wait;
+               $self->cat_async_wait;
+       }
+}
+
 # returns true if there are pending "git cat-file" processes
 sub cleanup {
        my ($self) = @_;
        local $in_cleanup = 1;
        delete $self->{async_cat};
-       check_async_wait($self);
-       cat_async_wait($self);
+       async_wait_all($self);
        delete $self->{inflight};
        delete $self->{inflight_c};
        _destroy($self, qw(cat_rbuf in out pid));
@@ -420,10 +432,9 @@ sub cat_async_begin {
 sub cat_async ($$$;$) {
        my ($self, $oid, $cb, $arg) = @_;
        my $inflight = $self->{inflight} // cat_async_begin($self);
-       if (scalar(@$inflight) >= MAX_INFLIGHT) {
+       while (scalar(@$inflight) >= MAX_INFLIGHT) {
                cat_async_step($self, $inflight);
        }
-
        print { $self->{out} } $oid, "\n" or fail($self, "write error: $!");
        push(@$inflight, $oid, $cb, $arg);
 }
@@ -466,6 +477,57 @@ sub modified ($) {
        $modified || time;
 }
 
+# for grokmirror, which doesn't read gitweb.description
+# templates/hooks--update.sample and git-multimail in git.git
+# only match "Unnamed repository", not the full contents of
+# templates/this--description in git.git
+sub manifest_entry {
+       my ($self, $epoch, $default_desc) = @_;
+       my ($fh, $pid) = $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
+       my $git_dir = $self->{git_dir};
+       my $ent = {
+               fingerprint => $dig->hexdigest,
+               reference => undef,
+               modified => modified($self),
+       };
+       chomp(my $owner = $self->qx('config', 'gitweb.owner'));
+       utf8::decode($owner);
+       $ent->{owner} = $owner eq '' ? undef : $owner;
+       my $desc = '';
+       if (open($fh, '<', "$git_dir/description")) {
+               local $/ = "\n";
+               chomp($desc = <$fh>);
+               utf8::decode($desc);
+       }
+       $desc = 'Unnamed repository' if $desc eq '';
+       if (defined $epoch && $desc =~ /\AUnnamed repository/) {
+               $desc = "$default_desc [epoch $epoch]";
+       }
+       $ent->{description} = $desc;
+       if (open($fh, '<', "$git_dir/objects/info/alternates")) {
+               # n.b.: GitPython doesn't seem to handle comments or C-quoted
+               # strings like native git does; and we don't for now, either.
+               local $/ = "\n";
+               chomp(my @alt = <$fh>);
+
+               # grokmirror only supports 1 alternate for "reference",
+               if (scalar(@alt) == 1) {
+                       my $objdir = "$git_dir/objects";
+                       my $ref = File::Spec->rel2abs($alt[0], $objdir);
+                       $ref =~ s!/[^/]+/?\z!!; # basename
+                       $ent->{reference} = $ref;
+               }
+       }
+       $ent;
+}
+
 1;
 __END__
 =pod