www_coderepo: tree: quiet and 404 on non-existent refs

Clients should see 404s when attempting to hit files for deleted
branches or tags.

2 files changed, 25 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);
 }
 
diff --git a/t/solver_git.t b/t/solver_git.t
index 122cf888..7743913b 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -396,6 +396,13 @@ EOF
                 is($res->code, 200, 'got 200 for a directory');
                 $got = $res->content;
                 like($got, qr/\bgit ls-tree\b/, 'ls-tree help shown');
+
+                $res = $cb->(GET('/public-inbox/tree/?h=no-branch'));
+                is($res->code, 404, 'got 404 for non-existent ref root');
+                $res = $cb->(GET('/public-inbox/tree/README?h=no-file'));
+                is($res->code, 404, 'got 404 for non-existent ref README');
+                $res = $cb->(GET('/public-inbox/tree/Documentation?h=no-dir'));
+                is($res->code, 404, 'got 404 for non-existent ref directory');
         };
         test_psgi(sub { $www->call(@_) }, $client);
         my $env = { PI_CONFIG => $cfgpath, TMPDIR => $tmpdir };