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
+ delete($ctx->{-wcb})->($ctx->html_done($x));
+}
+
+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'} = $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
@@ -245,16 +344,16 @@ 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,
- "$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);
@@ -262,6 +361,126 @@ sub show_other ($$) {
$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 = $ctx->{-path} // $qp->{b}; # {-path} is from RepoTree
+ $$bref = "
tree $ctx->{tree_oid}";
+ # $REPO/tree/$path already sets {-upfx}
+ my $upfx = $ctx->{-upfx} //= '../../';
+ if (defined $pfx) {
+ $pfx =~ s!/+\z!!s;
+ if (my $t = $ctx->{-obj}) {
+ my $t = ascii_html($t);
+ $$bref .= <path: $x\n);
+ }
+ } else {
+ $pfx = '';
+ $$bref .= qq[ (path 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 @ 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.
+
+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.
".dbg_log($ctx));
# TODO: detect + convert to ensure validity
utf8::decode($$blob);
@@ -314,14 +550,14 @@ EOM
}
# using some of the same CSS class names and ids as cgit
- html_page($ctx, 200, "
'. # pad for non-CSS users
- "" .
- $ctx->{-linkify}->linkify_2($$blob) .
+ "
";
+ # scratchpad in this loop is faster here than `printf $zfh':
+ $x .= sprintf("% ${pad}u\n", $_) for (1..$nl);
+ $x .= '
'. # pad for non-CSS users
+ "";
+ html_page($ctx, 200, $x, $ctx->{-linkify}->linkify_2($$blob),
'
'.dbg_log($ctx));
}
@@ -340,6 +576,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 {