X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FRepoTree.pm;h=25dc5b10fab84fa7ee68b876955bb9ea8e7b6926;hb=HEAD;hp=7434e9b275f08d2dd8f5c19e1333bb0b2b40ff0e;hpb=1c8b8a0a7a8bf81303bd2b1f6ad5b377ec1fa4b2;p=public-inbox.git diff --git a/lib/PublicInbox/RepoTree.pm b/lib/PublicInbox/RepoTree.pm index 7434e9b2..25dc5b10 100644 --- a/lib/PublicInbox/RepoTree.pm +++ b/lib/PublicInbox/RepoTree.pm @@ -18,10 +18,12 @@ sub rd_404_log { PublicInbox::WwwStream::html_init($ctx); my $zfh = $ctx->{zfh}; print $zfh "
\$ git log -1 $tip -- $path\n"; + my $code = 200; if ($$bref eq '') { - say $zfh "found no record of `$path' in git history"; + say $zfh "found no record of `$path' in git history in `$tip'"; $ctx->{-has_srch} and say $zfh 'perhaps try searching mail (above)'; + $code = 404; } else { my ($H, $h, $s_as) = split(/ /, $$bref, 3); utf8::decode($s_as); @@ -33,17 +35,29 @@ found last record of `$path' in the following commit: $h $s_as EOM } - delete($ctx->{-wcb})->($ctx->html_done); + my $res = $ctx->html_done; + $res->[0] = $code; + delete($ctx->{-wcb})->($res); } sub find_missing { my ($ctx) = @_; + if ($ctx->{-path} eq '') { + my $tip = 'HEAD'; + $tip = ascii_html($ctx->{qp}->{h}) if defined($ctx->{qp}->{h}); + PublicInbox::WwwStream::html_init($ctx); + print { $ctx->{zfh} } "`$tip' ref not found"; + my $res = $ctx->html_done; + $res->[0] = 404; + return delete($ctx->{-wcb})->($res); + } my $cmd = ['git', "--git-dir=$ctx->{git}->{git_dir}", qw(log --no-color -1), '--pretty=%H %h %s (%as)' ]; push @$cmd, $ctx->{qp}->{h} if defined($ctx->{qp}->{h}); push @$cmd, '--'; - push @$cmd, $ctx->{-path} if $ctx->{-path} ne ''; - my $qsp = PublicInbox::Qspawn->new($cmd); + push @$cmd, $ctx->{-path}; + my $qsp = PublicInbox::Qspawn->new($cmd, undef, + { quiet => 1, 2 => $ctx->{lh} }); $qsp->psgi_qx($ctx->{env}, undef, \&rd_404_log, $ctx); } @@ -51,11 +65,12 @@ sub tree_show { # git check_async callback my ($oid, $type, $size, $ctx) = @_; return find_missing($ctx) if $type eq 'missing'; - open $ctx->{lh}, '<', \(my $dbg_log = '') or die "open(scalar): $!"; my $res = [ $ctx->{git}, $oid, $type, $size ]; my ($bn) = ($ctx->{-path} =~ m!/?([^/]+)\z!); if ($type eq 'blob') { my $obj = ascii_html($ctx->{-obj}); + $ctx->{-q_value_html} = 'dfn:'.ascii_html($ctx->{-path}) . + ' dfpost:'.substr($oid, 0, 7); $ctx->{-paths} = [ $bn, qq[(raw) \$ git show $obj\t# shows this blob on the CLI] ];