commit $ctx->{cmt_H}$x
- tree $ctx->{cmt_T}
+ commit $H$x
+ tree $T
author $au
committer $co
$s
EOM
- $x = delete $ctx->{cmt_b};
- $ctx->zmore("\n", $ctx->{-linkify}->to_html($x)) if length($x);
- undef $x;
+ $ctx->zmore("\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");
} else { # prepare flush_diff:
- $ctx->{obuf} = \$x;
+ read($fh, $x, -s _);
+ $ctx->{obuf} = \$bdy;
$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
+ $ctx->zmore($bdy);
+ undef $bdy;
# TODO: should there be another textarea which attempts to
# search for the exact email which was applied to make this
# commit?
@@ -213,14 +238,64 @@ id=related>find related emails, including ancestors/descendants/conflicts
EOM
}
}
- $x = $ctx->zflush($ctx->_html_end);
+ chop($x = <glossary
+--------
+Commit objects reference one tree, and zero or more parents.
+
+Single parent commits can typically generate a patch in
+unified diff format via `git format-patch'.
+
+Multiple parents means the commit is a merge.
+
+Root commits have no ancestor. Note that it is
+possible to have multiple root commits when merging independent histories.
+
+Every commit references one top-level tree object.
+EOM
+ $x = $ctx->zflush($x, $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]]);
}
-sub show_commit ($$$$) {
- my ($ctx, $res, $logref, $fn) = @_;
+sub stream_patch_parse_hdr { # {parse_hdr} for Qspawn
+ my ($r, $bref, $ctx) = @_;
+ if (!defined $r) { # sysread error
+ html_page($ctx, 500, dbg_log($ctx));
+ } elsif (index($$bref, "\n\n") >= 0) {
+ my $eml = bless { hdr => $bref }, 'PublicInbox::Eml';
+ my $fn = to_filename($eml->header('Subject') // '');
+ $fn = substr($fn // 'PATCH-no-subject', 6); # drop "PATCH-"
+ return [ 200, [ 'Content-Type', 'text/plain; charset=UTF-8',
+ 'Content-Disposition',
+ qq(inline; filename=$fn.patch) ] ];
+ } elsif ($r == 0) {
+ my $log = dbg_log($ctx);
+ warn "premature EOF on $ctx->{patch_oid} $log";
+ return html_page($ctx, 500, $log);
+ } else {
+ undef; # bref keeps growing until "\n\n"
+ }
+}
+
+sub show_patch ($$) {
+ my ($ctx, $res) = @_;
+ my ($git, $oid) = @$res;
+ my @cmd = ('git', "--git-dir=$git->{git_dir}",
+ 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->{patch_oid} = $oid;
+ $qsp->psgi_return($ctx->{env}, undef, \&stream_patch_parse_hdr, $ctx);
+}
+
+sub show_commit ($$) {
+ my ($ctx, $res) = @_;
+ return show_patch($ctx, $res) if ($ctx->{fn} // '') =~ /\.patch\z/;
my ($git, $oid) = @$res;
# patch-id needs two passes, and we use the initial show to ensure
# a patch embedded inside the commit message body doesn't get fed
@@ -231,89 +306,143 @@ sub show_commit ($$$$) {
'git show --encoding=UTF-8 --pretty=format:%n -M'.
" --stat -p $oid >p && ".
"git patch-id --stable $git->{git_dir} };
- my $tmp = File::Temp->newdir("show-$oid-XXXX", TMPDIR => 1);
- my $qsp = PublicInbox::Qspawn->new($cmd, $xenv, { -C => "$tmp" });
+ my $e = { GIT_DIR => $git->{git_dir} };
+ my $qsp = PublicInbox::Qspawn->new($cmd, $e, { -C => "$ctx->{-tmp}" });
$qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
- $ctx->{-logref} = $logref;
- $ctx->{-tmp} = $tmp;
$ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb};
$ctx->{git} = $git;
$qsp->psgi_qx($ctx->{env}, undef, \&show_commit_start, $ctx);
}
-sub show_other ($$$$) {
- my ($ctx, $res, $logref, $fn) = @_;
+sub show_other ($$) {
+ my ($ctx, $res) = @_;
my ($git, $oid, $type, $size) = @$res;
- if ($size > $MAX_SIZE) {
- $$logref = "$oid is too big to show\n" . $$logref;
- return html_page($ctx, 200, $logref);
- }
+ $size > $MAX_SIZE and return html_page($ctx, 200,
+ 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->{qsp_err} = \($ctx->{-qsp_err} = '');
- $ctx->{-logref} = $logref;
$qsp->psgi_qx($ctx->{env}, undef, \&show_other_result, $ctx);
}
-# user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
-sub solve_result {
- my ($res, $ctx) = @_;
- my ($log, $hints, $fn) = delete @$ctx{qw(log hints fn)};
-
- unless (seek($log, 0, 0)) {
- warn "seek(log): $!";
- return html_page($ctx, 500, \'seek error');
+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 = "tree $ctx->{tree_oid}";
+ if (defined $pfx) {
+ my $x = ascii_html($pfx);
+ $pfx .= '/';
+ $$bref .= qq( path: $x\n);
+ } else {
+ $pfx = '';
+ $$bref .= qq[ (path unknown)\n];
}
- $log = do { local $/; <$log> };
+ 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 @ commit$oid";
+ next;
+ }
+ my $q = 'b='.ascii_html(uri_escape_path($pfx.$f));
+ if ($m eq 'd') { $n .= '/' }
+ elsif ($m eq 'x') { $n = "$n" }
+ elsif ($m eq 'l') { $n = "$n" }
+ $$bref .= qq(\n$m\t$sz\t$n);
+ }
+ $$bref .= dbg_log($ctx);
+ $$bref .= <glossary
+--------
+Tree objects belong to commits or other tree objects. Trees may
+reference blobs, sub-trees, or commits of submodules.
- my $l = PublicInbox::Linkify->new;
- $log = 'debug log:
' .
- $l->to_html($log) . '
';
+Path 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.
+
+Commit objects may be stored in trees to reference submodules.
+EOM
+ chop $$bref;
+ html_page($ctx, 200, $$bref);
+}
- $res or return html_page($ctx, 404, \$log);
- ref($res) eq 'ARRAY' or return html_page($ctx, 500, \$log);
+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);
+}
+
+# user_cb for SolverGit, called as: user_cb->($result_or_error, $uarg)
+sub solve_result {
+ my ($res, $ctx) = @_;
+ my $hints = delete $ctx->{hints};
+ $res or return html_page($ctx, 404, dbg_log($ctx));
+ ref($res) eq 'ARRAY' or return html_page($ctx, 500, dbg_log($ctx));
my ($git, $oid, $type, $size, $di) = @$res;
- return show_commit($ctx, $res, \$log, $fn) if $type eq 'commit';
- return show_other($ctx, $res, \$log, $fn) if $type ne 'blob';
+ return show_commit($ctx, $res) if $type eq 'commit';
+ return show_tree($ctx, $res) if $type eq 'tree';
+ return show_other($ctx, $res) if $type ne 'blob';
my $path = to_filename($di->{path_b} // $hints->{path_b} // 'blob');
my $raw_link = "(raw)";
if ($size > $MAX_SIZE) {
- return stream_large_blob($ctx, $res, \$log, $fn) if defined $fn;
- $log = "Too big to show, download available\n" .
- "$oid $type $size bytes $raw_link
" . $log;
- return html_page($ctx, 200, \$log);
+ return stream_large_blob($ctx, $res) if defined $ctx->{fn};
+ return html_page($ctx, 200, <Too big to show, download available
+blob $oid $size bytes $raw_link
+EOM
}
my $blob = $git->cat_file($oid);
if (!$blob) { # WTF?
my $e = "Failed to retrieve generated blob ($oid)";
warn "$e ($git->{git_dir})";
- $log = "$e
" . $log;
- return html_page($ctx, 500, \$log);
+ return html_page($ctx, 500, "$e
".dbg_log($ctx))
}
my $bin = index(substr($$blob, 0, $BIN_DETECT), "\0") >= 0;
- if (defined $fn) {
+ if (defined $ctx->{fn}) {
my $h = [ 'Content-Length', $size, 'Content-Type' ];
push(@$h, ($bin ? 'application/octet-stream' : 'text/plain'));
return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]);
}
- if ($bin) {
- $log = "$oid $type $size bytes (binary)" .
- " $raw_link
" . $log;
- return html_page($ctx, 200, \$log);
- }
+ $bin and return html_page($ctx, 200,
+ "blob $oid $size bytes (binary)" .
+ " $raw_link
".dbg_log($ctx));
# TODO: detect + convert to ensure validity
utf8::decode($$blob);
my $nl = ($$blob =~ s/\r?\n/\n/sg);
my $pad = length($nl);
- $l->linkify_1($$blob);
+ ($ctx->{-linkify} //= PublicInbox::Linkify->new)->linkify_1($$blob);
my $ok = $hl->do_hl($blob, $path) if $hl;
if ($ok) {
$blob = $ok;
@@ -321,18 +450,16 @@ sub solve_result {
$$blob = ascii_html($$blob);
}
- # using some of the same CSS class names and ids as cgit
- $log = "$oid $type $size bytes $raw_link
" .
+ my $x = "blob $oid $size bytes $raw_link
" .
"
".
- "" . join('', map {
- sprintf("% ${pad}u\n", $_)
- } (1..$nl)) . '' .
- ' | '. # pad for non-CSS users
- "" .
- $l->linkify_2($$blob) .
- '
' . $log;
-
- html_page($ctx, 200, \$log);
+ "";
+ $x .= sprintf("% ${pad}u\n", $_) for (1..$nl);
+ $x .= ' | '. # pad for non-CSS users
+ "";
+
+ # using some of the same CSS class names and ids as cgit
+ html_page($ctx, 200, $x, $ctx->{-linkify}->linkify_2($$blob),
+ '
'.dbg_log($ctx));
}
# GET /$INBOX/$GIT_OBJECT_ID/s/
@@ -345,15 +472,16 @@ sub show ($$;$) {
defined(my $v = $qp->{$from}) or next;
$hints->{$to} = $v if $v ne '';
}
-
- $ctx->{'log'} = tmpfile("solve.$oid_b") // die "tmpfile: $!";
$ctx->{fn} = $fn;
+ $ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1);
+ open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!";
my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
\&solve_result, $ctx);
+ $solver->{tmp} = $ctx->{-tmp}; # share tmpdir
# PSGI server will call this immediately and give us a callback (-wcb)
sub {
$ctx->{-wcb} = $_[0]; # HTTP write callback
- $solver->solve($ctx->{env}, $ctx->{log}, $oid_b, $hints);
+ $solver->solve($ctx->{env}, $ctx->{lh}, $oid_b, $hints);
};
}