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;
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 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;
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
$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
}
}
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
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);
}
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,
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];
$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 .*> )([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) = @_;
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>)";