X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=7ac719bcaaa8d9e6e147f9c90bb52cdfc405ade1;hb=eea4b03f08b40647b7cf6016838d18ae26d98a08;hp=99ee2c116a4eabac80fa87c085dbe6041dd9df51;hpb=324098fecf1126233578cc2f6290b4c8fdd9207b;p=public-inbox.git

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 99ee2c11..7ac719bc 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -104,7 +104,7 @@ sub stream_large_blob ($$) {
 	$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 = '';
@@ -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];