No ext_urls

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

diff --git a/lib/PublicInbox/RepoTree.pm b/lib/PublicInbox/RepoTree.pm
index cec71eb6570108060c543a36dfe8195a877634a2..25dc5b10fab84fa7ee68b876955bb9ea8e7b6926 100644 (file)
--- a/lib/PublicInbox/RepoTree.pm
+++ b/lib/PublicInbox/RepoTree.pm
@@ -5,7 +5,6 @@
 package PublicInbox::RepoTree;
 use v5.12;
 use PublicInbox::ViewDiff qw(uri_escape_path);
-use PublicInbox::GitAsyncCat;
 use PublicInbox::WwwStatic qw(r);
 use PublicInbox::Qspawn;
 use PublicInbox::WwwStream qw(html_oneshot);
@@ -19,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);
@@ -34,29 +35,47 @@ 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);
 }
 
-sub tree_30x { # git check_async callback
+sub tree_show { # git check_async callback
        my ($oid, $type, $size, $ctx) = @_;
        return find_missing($ctx) if $type eq 'missing';
-       my $wcb = delete $ctx->{-wcb};
-       my $u = $ctx->{git}->base_url($ctx->{env});
-       my $path = uri_escape_path(delete $ctx->{-path});
-       $u .= "$oid/s/?b=$path";
-       $wcb->([ 302, [ Location => $u, 'Content-Type' => 'text/plain' ],
-               [ "Redirecting to $u\n" ] ])
+
+       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[(<a
+href="$ctx->{-upfx}$oid/s/$bn">raw</a>)
+\$ git show $obj\t# shows this blob on the CLI] ];
+       }
+       PublicInbox::ViewVCS::solve_result($res, $ctx);
 }
 
 sub srv_tree {
@@ -73,12 +92,7 @@ sub srv_tree {
        return if index($obj, "\n") >= 0;
        sub {
                $ctx->{-wcb} = $_[0]; # HTTP::{Chunked,Identity}
-               if ($ctx->{env}->{'pi-httpd.async'}) {
-                       async_check($ctx, $obj, \&tree_30x, $ctx);
-               } else {
-                       $ctx->{git}->check_async($obj, \&tree_30x, $ctx);
-                       $ctx->{git}->async_wait_all;
-               }
+               PublicInbox::ViewVCS::do_check_async($ctx, \&tree_show, $obj);
        };
 }