X-Git-Url: http://www.git.stargrave.org/?p=public-inbox.git;a=blobdiff_plain;f=lib%2FPublicInbox%2FGit.pm;h=9c96b3f0b6920acbcfd4a103e3ec14a7ec8618b6;hp=9059584086ca57ecfb3411cb2cae12b87cc9496b;hb=64a5e4f9b5cda6891d3dbd719d8a010da487bfc3;hpb=46baf956987dca495ed44b1050e64939fae5c8ab diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm index 90595840..9c96b3f0 100644 --- a/lib/PublicInbox/Git.pm +++ b/lib/PublicInbox/Git.pm @@ -1,4 +1,4 @@ -# Copyright (C) 2014-2019 all contributors +# Copyright (C) 2014-2020 all contributors # License: GPLv2 or later # # Used to read files from a git repository without excessive forking. @@ -9,9 +9,10 @@ package PublicInbox::Git; use strict; use warnings; -use POSIX qw(dup2); -require IO::Handle; -use PublicInbox::Spawn qw(spawn popen_rd); +use POSIX (); +use IO::Handle; # ->autoflush +use File::Glob qw(bsd_glob GLOB_NOSORT); +use PublicInbox::Spawn qw(popen_rd); use PublicInbox::Tmpfile; use base qw(Exporter); our @EXPORT_OK = qw(git_unquote git_quote); @@ -103,28 +104,24 @@ sub _bidi_pipe { } return; } - my ($in_r, $in_w, $out_r, $out_w); - - pipe($in_r, $in_w) or fail($self, "pipe failed: $!"); + my ($out_r, $out_w); pipe($out_r, $out_w) or fail($self, "pipe failed: $!"); - if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ - fcntl($out_w, 1031, 4096); - fcntl($in_w, 1031, 4096) if $batch eq '--batch-check'; - } - my @cmd = (qw(git), "--git-dir=$self->{git_dir}", qw(-c core.abbrev=40 cat-file), $batch); - my $redir = { 0 => fileno($out_r), 1 => fileno($in_w) }; + my $redir = { 0 => $out_r }; if ($err) { my $id = "git.$self->{git_dir}$batch.err"; my $fh = tmpfile($id) or fail($self, "tmpfile($id): $!"); $self->{$err} = $fh; - $redir->{2} = fileno($fh); + $redir->{2} = $fh; } - my $p = spawn(\@cmd, undef, $redir); - defined $p or fail($self, "spawn failed: $!"); + my ($in_r, $p) = popen_rd(\@cmd, undef, $redir); $self->{$pid} = $p; $out_w->autoflush(1); + if ($^O eq 'linux') { # 1031: F_SETPIPE_SZ + fcntl($out_w, 1031, 4096); + fcntl($in_r, 1031, 4096) if $batch eq '--batch-check'; + } $self->{$out} = $out_w; $self->{$in} = $in_r; } @@ -148,16 +145,18 @@ sub read_cat_in_full ($$$) { sub _cat_async_step ($$$) { my ($self, $inflight, $in) = @_; - my $cb = shift @$inflight or die 'BUG: inflight empty'; + my $pair = shift @$inflight or die 'BUG: inflight empty'; + my ($cb, $arg) = @$pair; local $/ = "\n"; my $head = $in->getline; - return eval { $cb->(undef) } if $head =~ / missing$/; + $head =~ / missing$/ and return + eval { $cb->(undef, undef, undef, undef, $arg) }; $head =~ /^([0-9a-f]{40}) (\S+) ([0-9]+)$/ or fail($self, "Unexpected result from async git cat-file: $head"); my ($oid_hex, $type, $size) = ($1, $2, $3 + 0); my $bref = read_cat_in_full($self, $in, $size); - eval { $cb->($bref, $oid_hex, $type, $size) }; + eval { $cb->($bref, $oid_hex, $type, $size, $arg) }; } sub cat_async_wait ($) { @@ -254,7 +253,6 @@ sub popen { sub qx { my ($self, @cmd) = @_; my $fh = $self->popen(@cmd); - defined $fh or return; local $/ = "\n"; return <$fh> if wantarray; local $/; @@ -276,7 +274,7 @@ sub packed_bytes { my ($self) = @_; my $n = 0; my $pack_dir = git_path($self, 'objects/pack'); - foreach my $p (glob("$pack_dir/*.pack")) { + foreach my $p (bsd_glob("$pack_dir/*.pack", GLOB_NOSORT)) { $n += -s $p; } $n @@ -298,7 +296,7 @@ sub host_prefix_url ($$) { my ($env, $url) = @_; return $url if index($url, '//') >= 0; my $scheme = $env->{'psgi.url_scheme'}; - my $host_port = $env->{HTTP_HOST} || + my $host_port = $env->{HTTP_HOST} // "$env->{SERVER_NAME}:$env->{SERVER_PORT}"; "$scheme://$host_port". ($env->{SCRIPT_NAME} || '/') . $url; } @@ -319,22 +317,24 @@ sub cat_async_begin { $self->{inflight} = []; } -sub cat_async ($$$) { - my ($self, $oid, $cb) = @_; +sub cat_async ($$$;$) { + my ($self, $oid, $cb, $arg) = @_; my $inflight = $self->{inflight} or die 'BUG: not in async'; if (scalar(@$inflight) >= MAX_INFLIGHT) { _cat_async_step($self, $inflight, $self->{in}); } $self->{out}->print($oid, "\n") or fail($self, "write error: $!"); - push @$inflight, $cb; + push(@$inflight, [ $cb, $arg ]); } -sub commit_title ($$) { - my ($self, $oid) = @_; # PublicInbox::Git, $sha1hex - my $buf = cat_file($self, $oid) or return; - utf8::decode($$buf); - ($$buf =~ /\r?\n\r?\n([^\r\n]+)\r?\n?/)[0] +sub extract_cmt_time { + my ($bref, undef, undef, undef, $modified) = @_; + + if ($$bref =~ /^committer .*?> ([0-9]+) [\+\-]?[0-9]+/sm) { + my $cmt_time = $1 + 0; + $$modified = $cmt_time if $cmt_time > $$modified; + } } # returns the modified time of a git repo, same as the "modified" field @@ -343,15 +343,13 @@ sub modified ($) { my ($self) = @_; my $modified = 0; my $fh = popen($self, qw(rev-parse --branches)); - defined $fh or return $modified; + cat_async_begin($self); local $/ = "\n"; - foreach my $oid (<$fh>) { + while (my $oid = <$fh>) { chomp $oid; - my $buf = cat_file($self, $oid) or next; - $$buf =~ /^committer .*?> ([0-9]+) [\+\-]?[0-9]+/sm or next; - my $cmt_time = $1 + 0; - $modified = $cmt_time if $cmt_time > $modified; + cat_async($self, $oid, \&extract_cmt_time, \$modified); } + cat_async_wait($self); $modified || time; }