www_stream: add trailing slash for help and color links

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

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 3d97300c43c3f0fca345d6719d925d3b9ad652eb..f680eb2ff19ed3edbeee5e88cb40e8218f042d28 100644 (file)
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -240,17 +240,16 @@ sub batch_prepare ($) {
 }
 
 sub _cat_file_cb {
-       my ($bref, undef, undef, $size, $result) = @_;
-       @$result = ($bref, $size);
+       my ($bref, $oid, $type, $size, $result) = @_;
+       @$result = ($bref, $oid, $type, $size);
 }
 
 sub cat_file {
-       my ($self, $oid, $sizeref) = @_;
+       my ($self, $oid) = @_;
        my $result = [];
        cat_async($self, $oid, \&_cat_file_cb, $result);
        cat_async_wait($self);
-       $$sizeref = $result->[1] if $sizeref;
-       $result->[0];
+       wantarray ? @$result : $result->[0];
 }
 
 sub check_async_step ($$) {
@@ -363,10 +362,8 @@ sub popen {
 
 # same args as popen above
 sub qx {
-       my $self = shift;
-       my $fh = $self->popen(@_);
+       my $fh = popen(@_);
        if (wantarray) {
-               local $/ = "\n";
                my @ret = <$fh>;
                close $fh; # caller should check $?
                @ret;
@@ -378,6 +375,13 @@ sub qx {
        }
 }
 
+sub date_parse {
+       my $self = shift;
+       map {
+               substr($_, length('--max-age='), -1)
+       } $self->qx('rev-parse', map { "--since=$_" } @_);
+}
+
 # check_async and cat_async may trigger the other, so ensure they're
 # both completely done by using this:
 sub async_wait_all ($) {
@@ -463,20 +467,6 @@ sub cat_async ($$$;$) {
        push(@$inflight, $oid, $cb, $arg);
 }
 
-sub async_prefetch {
-       my ($self, $oid, $cb, $arg) = @_;
-       if (my $inflight = $self->{inflight}) {
-               # we could use MAX_INFLIGHT here w/o the halving,
-               # but lets not allow one client to monopolize a git process
-               if (scalar(@$inflight) < int(MAX_INFLIGHT/2)) {
-                       print { $self->{out} } $oid, "\n" or
-                                               $self->fail("write error: $!");
-                       return push(@$inflight, $oid, $cb, $arg);
-               }
-       }
-       undef;
-}
-
 sub extract_cmt_time {
        my ($bref, undef, undef, undef, $modified) = @_;