-# 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.
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 {
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;
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");
$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));
sub qx {
my ($self, @cmd) = @_;
my $fh = $self->popen(@cmd);
+ defined $fh or return;
local $/ = "\n";
return <$fh> if wantarray;
local $/;
_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;