diff options
Diffstat (limited to 'lib/PublicInbox/RepoTree.pm')
| -rw-r--r-- | lib/PublicInbox/RepoTree.pm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/lib/PublicInbox/RepoTree.pm b/lib/PublicInbox/RepoTree.pm index 3a848c6f..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 "<pre>\$ 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: <a href="$ctx->{-upfx}$H/s/?b=$x">$h</a> $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} } "<pre>`$tip' ref not found</pre>"; + 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); } |