www_stream: coderepo-specific top bar

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

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 02e98768602ae0d9529f9140a0dbdf20cf81e581..7ac719bcaaa8d9e6e147f9c90bb52cdfc405ade1 100644 (file)
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -100,11 +100,11 @@ sub stream_large_blob ($$) {
        my $cmd = ['git', "--git-dir=$git->{git_dir}", 'cat-file', $type, $oid];
        my $qsp = PublicInbox::Qspawn->new($cmd);
        my $env = $ctx->{env};
-       $env->{'qspawn.wcb'} = delete $ctx->{-wcb};
+       $env->{'qspawn.wcb'} = $ctx->{-wcb};
        $qsp->psgi_return($env, undef, \&stream_blob_parse_hdr, $ctx);
 }
 
-sub show_other_result ($$) { # tag
+sub show_other_result ($$) { # future-proofing
        my ($bref, $ctx) = @_;
        if (my $qsp_err = delete $ctx->{-qsp_err}) {
                return html_page($ctx, 500, dbg_log($ctx) .
@@ -155,21 +155,29 @@ sub show_commit_start { # ->psgi_qx callback
 
 sub ibx_url_for {
        my ($ctx) = @_;
-       $ctx->{ibx} and return; # just fall back to $upfx
-       $ctx->{git} or return; # /$CODEREPO/$OID/s/ to (eidx|ibx)
+       $ctx->{ibx} and return; # fall back to $upfx
+       $ctx->{git} or die 'BUG: no {git}';
        if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) {
-               $ALL->base_url // $ALL->base_url($ctx->{env});
-       } elsif (my $ibxs = $ctx->{git}->{-ibxs}) {
-               for my $ibx (@$ibxs) {
-                       if ($ibx->isrch) {
-                               return defined($ibx->{url}) ?
-                                       prurl($ctx->{env}, $ibx->{url}) :
-                                       "../../../$ibx->{name}/";
-                       }
+               if (defined(my $u = $ALL->base_url($ctx->{env}))) {
+                       return wantarray ? ($u) : $u;
                }
-       } else {
-               undef;
        }
+       my @ret;
+       if (my $ibx_names = $ctx->{git}->{ibx_names}) {
+               my $by_name = $ctx->{www}->{pi_cfg}->{-by_name};
+               for my $name (@$ibx_names) {
+                       my $ibx = $by_name->{$name} // do {
+                               warn "inbox `$name' no longer exists\n";
+                               next;
+                       };
+                       $ibx->isrch // next;
+                       my $u = defined($ibx->{url}) ?
+                               prurl($ctx->{env}, $ibx->{url}) : $name;
+                       $u .= '/' if substr($u, -1) ne '/';
+                       push @ret, $u;
+               }
+       }
+       wantarray ? (@ret) : $ret[0];
 }
 
 sub cmt_finalize {
@@ -212,7 +220,7 @@ href="$f.patch">patch</a>)\n   <a href=#parent>parent</a> $P->[0]};
        my $zfh = $ctx->zfh;
        print $zfh <<EOM;
 <pre>   <a href=#commit>commit</a> $H$x
-     <a href=#tree>tree</a> <a href="$upfx$T/s/">$T</a>
+     <a href=#tree>tree</a> <a href="$upfx$T/s/?b=">$T</a>
    author $au
 committer $co
 
@@ -250,8 +258,10 @@ EOM
                        my $ibx_url = ibx_url_for($ctx);
                        my $alt;
                        if (defined $ibx_url) {
+                               $alt = " `$ibx_url'";
+                               $ibx_url =~ m!://! or
+                                       substr($ibx_url, 0, 0, '../../../');
                                $ibx_url = ascii_html($ibx_url);
-                               $alt = ' '.$ibx_url;
                        } else {
                                $ibx_url = $upfx;
                                $alt = '';
@@ -282,7 +292,7 @@ possible to have multiple root commits when merging independent histories.
 
 Every commit references one top-level <dfn id=tree>tree</dfn> object.</pre>
 EOM
-       delete($ctx->{env}->{'qspawn.wcb'})->($ctx->html_done($x));
+       delete($ctx->{-wcb})->($ctx->html_done($x));
 }
 
 sub stream_patch_parse_hdr { # {parse_hdr} for Qspawn
@@ -312,7 +322,7 @@ sub show_patch ($$) {
                qw(format-patch -1 --stdout -C),
                "--signature=git format-patch -1 --stdout -C $oid", $oid);
        my $qsp = PublicInbox::Qspawn->new(\@cmd);
-       $ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb};
+       $ctx->{env}->{'qspawn.wcb'} = $ctx->{-wcb};
        $ctx->{patch_oid} = $oid;
        $qsp->psgi_return($ctx->{env}, undef, \&stream_patch_parse_hdr, $ctx);
 }
@@ -333,7 +343,7 @@ sub show_commit ($$) {
        my $e = { GIT_DIR => $git->{git_dir} };
        my $qsp = PublicInbox::Qspawn->new($cmd, $e, { -C => "$ctx->{-tmp}" });
        $qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
-       $ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb};
+       $ctx->{env}->{'qspawn.wcb'} = $ctx->{-wcb};
        $ctx->{git} = $git;
        $qsp->psgi_qx($ctx->{env}, undef, \&show_commit_start, $ctx);
 }
@@ -362,9 +372,13 @@ sub show_tree_result ($$) {
        my $pfx = $qp->{b};
        $$bref = "<pre><a href=#tree>tree</a> $ctx->{tree_oid}";
        if (defined $pfx) {
-               my $x = ascii_html($pfx);
-               $pfx .= '/';
-               $$bref .= qq(  <a href=#path>path</a>: $x</a>\n);
+               if ($pfx eq '') {
+                       $$bref .= "  (root)\n";
+               } else {
+                       my $x = ascii_html($pfx);
+                       $pfx .= '/';
+                       $$bref .= qq(  <a href=#path>path</a>: $x</a>\n);
+               }
        } else {
                $pfx = '';
                $$bref .= qq[  (<a href=#path>path</a> unknown)\n];