wwwstream: flesh out clone instructions for v2

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index bc0e5064d7ca5da0e69febb7076d3639baa2c79b..95df52ed6f2fd9f2b058d404d4358acebf0532c2 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -1,5 +1,5 @@
-# Copyright (C) 2014-2015 all contributors <meta@public-inbox.org>
-# License: GPLv2 or later (https://www.gnu.org/licenses/gpl-2.0.txt)
+# Copyright (C) 2014-2018 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.
 # Used in our web interfaces as well as our -nntpd server.
@@ -15,7 +15,19 @@ use PublicInbox::Spawn qw(spawn popen_rd);
 
 sub new {
        my ($class, $git_dir) = @_;
-       bless { git_dir => $git_dir }, $class
+       my @st;
+       $st[7] = $st[10] = 0;
+       bless { git_dir => $git_dir, st => \@st }, $class
+}
+
+sub alternates_changed {
+       my ($self) = @_;
+       my $alt = "$self->{git_dir}/objects/info/alternates";
+       my @st = stat($alt) or return 0;
+       my $old_st = $self->{st};
+       # 10 - ctime, 7 - size
+       return 0 if ($st[10] == $old_st->[10] && $st[7] == $old_st->[7]);
+       $self->{st} = \@st;
 }
 
 sub _bidi_pipe {
@@ -28,7 +40,9 @@ sub _bidi_pipe {
 
        my @cmd = ('git', "--git-dir=$self->{git_dir}", qw(cat-file), $batch);
        my $redir = { 0 => fileno($out_r), 1 => fileno($in_w) };
-       $self->{$pid} = spawn(\@cmd, undef, $redir);
+       my $p = spawn(\@cmd, undef, $redir);
+       defined $p or fail($self, "spawn failed: $!");
+       $self->{$pid} = $p;
        $out_w->autoflush(1);
        $self->{$out} = $out_w;
        $self->{$in} = $in_r;
@@ -36,14 +50,23 @@ sub _bidi_pipe {
 
 sub cat_file {
        my ($self, $obj, $ref) = @_;
+       my ($retried, $in, $head);
 
-       $self->_bidi_pipe(qw(--batch in out pid));
+again:
+       batch_prepare($self);
        $self->{out}->print($obj, "\n") or fail($self, "write error: $!");
 
-       my $in = $self->{in};
+       $in = $self->{in};
        local $/ = "\n";
-       my $head = $in->getline;
-       $head =~ / missing$/ and return undef;
+       $head = $in->getline;
+       if ($head =~ / missing$/) {
+               if (!$retried && alternates_changed($self)) {
+                       $retried = 1;
+                       cleanup($self);
+                       goto again;
+               }
+               return;
+       }
        $head =~ /^[0-9a-f]{40} \S+ (\d+)$/ or
                fail($self, "Unexpected result from git cat-file: $head");
 
@@ -87,6 +110,8 @@ sub cat_file {
        $rv;
 }
 
+sub batch_prepare ($) { _bidi_pipe($_[0], qw(--batch in out pid)) }
+
 sub check {
        my ($self, $obj) = @_;
        $self->_bidi_pipe(qw(--batch-check in_c out_c pid_c));
@@ -122,6 +147,7 @@ sub popen {
 sub qx {
        my ($self, @cmd) = @_;
        my $fh = $self->popen(@cmd);
+       defined $fh or return;
        local $/ = "\n";
        return <$fh> if wantarray;
        local $/;
@@ -134,6 +160,18 @@ sub cleanup {
        _destroy($self, qw(in_c out_c pid_c));
 }
 
+# assuming a well-maintained repo, this should be a somewhat
+# accurate estimation of its size
+# TODO: show this in the WWW UI as a hint to potential cloners
+sub packed_bytes {
+       my ($self) = @_;
+       my $n = 0;
+       foreach my $p (glob("$self->{git_dir}/objects/pack/*.pack")) {
+               $n += -s $p;
+       }
+       $n
+}
+
 sub DESTROY { cleanup(@_) }
 
 1;