use PublicInbox::WwwStream qw(html_oneshot);
use PublicInbox::Linkify;
use PublicInbox::Tmpfile;
-use PublicInbox::ViewDiff qw(flush_diff);
+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;
my $SHOW_FMT = '--pretty=format:'.join('%n', '%P', '%p', '%H', '%T', '%s', '%f',
'%an <%ae> %ai', '%cn <%ce> %ci', '%b%x00');
+my %GIT_MODE = (
+ '100644' => ' ', # blob
+ '100755' => 'x', # executable blob
+ '040000' => 'd', # tree
+ '120000' => 'l', # symlink
+ '160000' => 'g', # commit (gitlink)
+);
+
sub html_page ($$;@) {
my ($ctx, $code) = @_[0, 1];
my $wcb = delete $ctx->{-wcb};
return '<pre>debug log read error</pre>';
};
$ctx->{-linkify} //= PublicInbox::Linkify->new;
- '<pre>debug log:</pre><hr /><pre>'.
+ "<hr><pre>debug log:\n\n".
$ctx->{-linkify}->to_html($log).'</pre>';
}
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, tree, ...
+sub show_other_result ($$) { # tag
my ($bref, $ctx) = @_;
if (my $qsp_err = delete $ctx->{-qsp_err}) {
return html_page($ctx, 500, dbg_log($ctx) .
chop(my $buf = do { local $/ = "\0"; <$fh> });
chomp $buf;
my ($P, $p);
- ($P, $p, @$ctx{qw(cmt_H cmt_T cmt_s cmt_f cmt_au cmt_co cmt_b)})
- = split(/\n/, $buf, 9);
+ ($P, $p, @{$ctx->{cmt_info}}) = split(/\n/, $buf, 9);
return cmt_finalize($ctx) if !$P;
@{$ctx->{-cmt_P}} = split(/ /, $P);
@{$ctx->{-cmt_p}} = split(/ /, $p); # abbreviated
}
}
+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 $upfx = $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
+ my ($H, $T, $s, $f, $au, $co, $bdy) = @{delete $ctx->{cmt_info}};
# try to keep author and committer dates lined up
- my ($au, $co) = delete @$ctx{qw(cmt_au cmt_co)};
my $x = length($au) - length($co);
if ($x > 0) {
$x = ' ' x $x;
$au =~ s/>/>$x/;
}
$_ = ascii_html($_) for ($au, $co);
- my $s = $ctx->{-linkify}->to_html(delete $ctx->{cmt_s});
- $ctx->{-title_html} = $s;
- my $upfx = $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/"
+ $au =~ s!(> +)([0-9]{4,}-\S+ \S+)!
+ my ($gt, $t) = ($1, $2);
+ $t =~ tr/ :-//d;
+ qq($gt<a
+href="$upfx?t=$t"
+title="list contemporary emails">$2</a>)
+ !e;
+ $ctx->{-title_html} = $s = $ctx->{-linkify}->to_html($s);
my ($P, $p, $pt) = delete @$ctx{qw(-cmt_P -cmt_p -cmt_pt)};
$_ = qq(<a href="$upfx$_/s/">).shift(@$p).'</a> '.shift(@$pt) for @$P;
if (@$P == 1) {
$x = qq{ (<a
-href="$ctx->{cmt_f}.patch">patch</a>)\n parent $P->[0]};
+href="$f.patch">patch</a>)\n <a href=#parent>parent</a> $P->[0]};
} elsif (@$P > 1) {
- $x = qq(\n parents $P->[0]\n);
+ $x = qq(\n <a href=#parents>parents</a> $P->[0]\n);
shift @$P;
$x .= qq( $_\n) for @$P;
chop $x;
} else {
- $x = ' (root commit)';
+ $x = ' (<a href=#root_commit>root commit</a>)';
}
PublicInbox::WwwStream::html_init($ctx);
- $ctx->zmore(<<EOM);
-<pre> commit $ctx->{cmt_H}$x
- tree <a href="$upfx$ctx->{cmt_T}/s/">$ctx->{cmt_T}</a>
+ 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>
author $au
committer $co
<b>$s</b>
EOM
- $x = delete $ctx->{cmt_b};
- $ctx->zmore("\n", $ctx->{-linkify}->to_html($x)) if length($x);
- undef $x;
+ print $zfh "\n", $ctx->{-linkify}->to_html($bdy) if length($bdy);
+ $bdy = '';
open my $fh, '<:utf8', "$ctx->{-tmp}/p" or
die "open $ctx->{-tmp}/p: $!";
if (-s $fh > $MAX_SIZE) {
- $ctx->zmore("---\n patch is too large to show\n");
+ print $zfh "---\n patch is too large to show\n";
} else { # prepare flush_diff:
- $ctx->{obuf} = \$x;
+ read($fh, $x, -s _);
$ctx->{-apfx} = $ctx->{-spfx} = $upfx;
- read($fh, my $bdy, -s _);
- $bdy =~ s/\r?\n/\n/gs;
- $ctx->{-anchors} = {} if $bdy =~ /^diff --git /sm;
- flush_diff($ctx, \$bdy); # undefs $bdy
- $ctx->zmore($x);
- undef $x;
+ $x =~ s/\r?\n/\n/gs;
+ $ctx->{-anchors} = {} if $x =~ /^diff --git /sm;
+ flush_diff($ctx, \$x); # undefs $x
# TODO: should there be another textarea which attempts to
# search for the exact email which was applied to make this
# commit?
$q = wrap('', '', $q);
my $rows = ($q =~ tr/\n/\n/) + 1;
$q = ascii_html($q);
- $ctx->zmore(<<EOM);
-<hr><form action=$upfx
+ 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="$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
}
}
- $x = $ctx->zflush($ctx->_html_end);
- my $res_hdr = delete $ctx->{-res_hdr};
- push @$res_hdr, 'Content-Length', length($x);
- delete($ctx->{env}->{'qspawn.wcb'})->([200, $res_hdr, [$x]]);
+ chop($x = <<EOM);
+<hr><pre>glossary
+--------
+<dfn
+id=commit>Commit</dfn> objects reference one tree, and zero or more parents.
+
+Single <dfn
+id=parent>parent</dfn> commits can typically generate a patch in
+unified diff format via `git format-patch'.
+
+Multiple <dfn id=parents>parents</dfn> means the commit is a merge.
+
+<dfn id=root_commit>Root commits</dfn> have no ancestor. Note that it is
+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->{-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,
- "$oid is too big to show\n". dbg_log($ctx));
+ ascii_html($type)." $oid is too big to show\n". dbg_log($ctx));
my $cmd = ['git', "--git-dir=$git->{git_dir}",
qw(show --encoding=UTF-8 --no-color --no-abbrev), $oid ];
my $qsp = PublicInbox::Qspawn->new($cmd);
$qsp->psgi_qx($ctx->{env}, undef, \&show_other_result, $ctx);
}
+sub show_tree_result ($$) {
+ my ($bref, $ctx) = @_;
+ if (my $qsp_err = delete $ctx->{-qsp_err}) {
+ return html_page($ctx, 500, dbg_log($ctx) .
+ "git ls-tree -z error:$qsp_err");
+ }
+ my @ent = split(/\0/, $$bref);
+ my $qp = delete $ctx->{qp};
+ my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
+ 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);
+ } else {
+ $pfx = '';
+ $$bref .= qq[ (<a href=#path>path</a> unknown)\n];
+ }
+ my ($x, $m, $t, $oid, $sz, $f, $n);
+ $$bref .= "\n size name";
+ for (@ent) {
+ ($x, $f) = split(/\t/, $_, 2);
+ undef $_;
+ ($m, $t, $oid, $sz) = split(/ +/, $x, 4);
+ $m = $GIT_MODE{$m} // '?';
+ utf8::decode($f);
+ $n = ascii_html($f);
+ if ($m eq 'g') { # gitlink submodule commit
+ $$bref .= "\ng\t\t$n @ <a\nhref=#g>commit</a>$oid";
+ next;
+ }
+ my $q = 'b='.ascii_html(uri_escape_path($pfx.$f));
+ if ($m eq 'd') { $n .= '/' }
+ elsif ($m eq 'x') { $n = "<b>$n</b>" }
+ elsif ($m eq 'l') { $n = "<i>$n</i>" }
+ $$bref .= qq(\n$m\t$sz\t<a\nhref="../../$oid/s/?$q">$n</a>);
+ }
+ $$bref .= dbg_log($ctx);
+ $$bref .= <<EOM;
+<pre>glossary
+--------
+<dfn
+id=tree>Tree</dfn> objects belong to commits or other tree objects. Trees may
+reference blobs, sub-trees, or commits of submodules.
+
+<dfn
+id=path>Path</dfn> names are stored in tree objects, but trees do not know
+their own path name. A tree's path name comes from their parent tree,
+or it is the root tree referenced by a commit object. Thus, this web UI
+relies on the `b=' URI parameter as a hint to display the path name.
+
+<dfn title="submodule commit"
+id=g>Commit</dfn> objects may be stored in trees to reference submodules.</pre>
+EOM
+ chop $$bref;
+ html_page($ctx, 200, $$bref);
+}
+
+sub show_tree ($$) {
+ my ($ctx, $res) = @_;
+ my ($git, $oid, undef, $size) = @$res;
+ $size > $MAX_SIZE and return html_page($ctx, 200,
+ "tree $oid is too big to show\n". dbg_log($ctx));
+ my $cmd = [ 'git', "--git-dir=$git->{git_dir}",
+ qw(ls-tree -z -l --no-abbrev), $oid ];
+ my $qsp = PublicInbox::Qspawn->new($cmd);
+ $ctx->{tree_oid} = $oid;
+ $qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
+ $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>)";
return stream_large_blob($ctx, $res) if defined $ctx->{fn};
return html_page($ctx, 200, <<EOM . dbg_log($ctx));
<pre><b>Too big to show, download available</b>
-"$oid $type $size bytes $raw_link</pre>
+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);
+ } else { # synchronous
+ $git->cat_async($oid, \&show_blob, $ctx);
+ $git->cat_async_wait;
+ }
+}
- my $blob = $git->cat_file($oid);
- if (!$blob) { # WTF?
+sub show_blob { # git->cat_async callback
+ my ($blob, $oid, $type, $size, $ctx) = @_;
+ if (!$blob) {
my $e = "Failed to retrieve generated blob ($oid)";
- warn "$e ($git->{git_dir})";
+ warn "$e ($ctx->{git}->{git_dir}) type=$type";
return html_page($ctx, 500, "<pre><b>$e</b></pre>".dbg_log($ctx))
}
return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]);
}
+ my ($path, $raw_link) = @{delete $ctx->{-paths}};
$bin and return html_page($ctx, 200,
- "<pre>$oid $type $size bytes (binary)" .
+ "<pre>blob $oid $size bytes (binary)" .
" $raw_link</pre>".dbg_log($ctx));
# TODO: detect + convert to ensure validity
$$blob = ascii_html($$blob);
}
- my $x = "<pre>$oid $type $size bytes $raw_link</pre>" .
+ # using some of the same CSS class names and ids as cgit
+ my $x = "<pre>blob $oid $size bytes $raw_link</pre>" .
"<hr /><table\nclass=blob>".
"<tr><td\nclass=linenumbers><pre>";
+ # scratchpad in this loop is faster here than `printf $zfh':
$x .= sprintf("<a id=n$_ href=#n$_>% ${pad}u</a>\n", $_) for (1..$nl);
$x .= '</pre></td><td><pre> </pre></td>'. # pad for non-CSS users
"<td\nclass=lines><pre\nstyle='white-space:pre'><code>";
-
- # using some of the same CSS class names and ids as cgit
html_page($ctx, 200, $x, $ctx->{-linkify}->linkify_2($$blob),
'</code></pre></td></tr></table>'.dbg_log($ctx));
}
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 {