X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=9a5596870bfc445ab600f2db5be7ec3aecd8dca1;hb=4c48cee337c2d05d13122e442f7950b640e25b38;hp=915cf2c5debe9e730ccc7bcd5329bc1bd11aefc9;hpb=4be57c1329b13dbeb8097dd49b5e43fbc9ec9754;p=public-inbox.git

diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index 915cf2c5..9a559687 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -25,7 +25,8 @@ use PublicInbox::ViewDiff qw(flush_diff uri_escape_path);
 use PublicInbox::View;
 use PublicInbox::Eml;
 use Text::Wrap qw(wrap);
-use PublicInbox::Hval qw(ascii_html to_filename);
+use PublicInbox::Hval qw(ascii_html to_filename prurl);
+use POSIX qw(strftime);
 my $hl = eval {
 	require PublicInbox::HlMod;
 	PublicInbox::HlMod->new;
@@ -99,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) .
@@ -152,6 +153,25 @@ 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)
+	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}/";
+			}
+		}
+	} else {
+		undef;
+	}
+}
+
 sub cmt_finalize {
 	my ($ctx) = @_;
 	$ctx->{-linkify} //= PublicInbox::Linkify->new;
@@ -192,7 +212,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
 
@@ -227,12 +247,21 @@ EOM
 			$q = wrap('', '', $q);
 			my $rows = ($q =~ tr/\n/\n/) + 1;
 			$q = ascii_html($q);
+			my $ibx_url = ibx_url_for($ctx);
+			my $alt;
+			if (defined $ibx_url) {
+				$ibx_url = ascii_html($ibx_url);
+				$alt = ' '.$ibx_url;
+			} else {
+				$ibx_url = $upfx;
+				$alt = '';
+			}
 			print $zfh <<EOM;
-<hr><form action=$upfx
+<hr><form action="$ibx_url"
 id=related><pre>find related emails, including ancestors/descendants/conflicts
 <textarea name=q cols=${\PublicInbox::View::COLS} rows=$rows>$q</textarea>
-<input type=submit value=search
-/>\t(<a href=${upfx}_/text/help/>help</a>)</pre></form>
+<input type=submit value="search$alt"
+/>\t(<a href="${ibx_url}_/text/help/">help</a>)</pre></form>
 EOM
 		}
 	}
@@ -253,7 +282,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
@@ -283,7 +312,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);
 }
@@ -304,12 +333,12 @@ 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);
 }
 
-sub show_other ($$) {
+sub show_other ($$) { # just in case...
 	my ($ctx, $res) = @_;
 	my ($git, $oid, $type, $size) = @$res;
 	$size > $MAX_SIZE and return html_page($ctx, 200,
@@ -333,9 +362,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];
@@ -393,6 +426,42 @@ sub show_tree ($$) {
 	$qsp->psgi_qx($ctx->{env}, undef, \&show_tree_result, $ctx);
 }
 
+# returns seconds offset from git TZ offset
+sub tz_adj ($) {
+	my ($tz) = @_; # e.g "-0700"
+	$tz = int($tz);
+	my $mm = $tz < 0 ? -$tz : $tz;
+	$mm = int($mm / 100) * 60 + ($mm % 100);
+	$mm = $tz < 0 ? -$mm : $mm;
+	($mm * 60);
+}
+
+sub show_tag_result { # git->cat_async callback
+	my ($bref, $oid, $type, $size, $ctx) = @_;
+	utf8::decode($$bref);
+	my $l = PublicInbox::Linkify->new;
+	$$bref = $l->to_html($$bref);
+	$$bref =~ s!^object ([a-f0-9]+)!object <a
+href=../../$1/s/>$1</a>!;
+
+	$$bref =~ s/^(tagger .*&gt; )([0-9]+) ([\-+]?[0-9]+)/$1.strftime(
+		'%Y-%m-%d %H:%M:%S', gmtime($2 + tz_adj($3)))." $3"/sme;
+	# TODO: download link
+	html_page($ctx, 200, '<pre>', $$bref, '</pre>', dbg_log($ctx));
+}
+
+sub show_tag ($$) {
+	my ($ctx, $res) = @_;
+	my ($git, $oid) = @$res;
+	$ctx->{git} = $git;
+	if ($ctx->{env}->{'pi-httpd.async'}) {
+		ibx_async_cat($ctx, $oid, \&show_tag_result, $ctx);
+	} else { # synchronous (generic PSGI)
+		$git->cat_async($oid, \&show_tag_result, $ctx);
+		$git->cat_async_wait;
+	}
+}
+
 # user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
 sub solve_result {
 	my ($res, $ctx) = @_;
@@ -403,6 +472,7 @@ sub solve_result {
 	my ($git, $oid, $type, $size, $di) = @$res;
 	return show_commit($ctx, $res) if $type eq 'commit';
 	return show_tree($ctx, $res) if $type eq 'tree';
+	return show_tag($ctx, $res) if $type eq 'tag';
 	return show_other($ctx, $res) if $type ne 'blob';
 	my $path = to_filename($di->{path_b} // $hints->{path_b} // 'blob');
 	my $raw_link = "(<a\nhref=$path>raw</a>)";
@@ -414,6 +484,7 @@ blob $oid $size bytes $raw_link</pre>
 EOM
 	}
 	@{$ctx->{-paths}} = ($path, $raw_link);
+	bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY
 	$ctx->{git} = $git;
 	if ($ctx->{env}->{'pi-httpd.async'}) {
 		ibx_async_cat($ctx, $oid, \&show_blob, $ctx);
@@ -483,6 +554,7 @@ sub show ($$;$) {
 	open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!";
 	my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
 						\&solve_result, $ctx);
+	$solver->{gits} //= [ $ctx->{git} ];
 	$solver->{tmp} = $ctx->{-tmp}; # share tmpdir
 	# PSGI server will call this immediately and give us a callback (-wcb)
 	sub {