commit $H$x
- tree $T
+ tree $T
author $au
committer $co
@@ -250,8 +276,10 @@ EOM
my $ibx_url = ibx_url_for($ctx);
my $alt;
if (defined $ibx_url) {
+ $alt = " `$ibx_url'";
+ $ibx_url =~ m!://! or
+ substr($ibx_url, 0, 0, '../../../');
$ibx_url = ascii_html($ibx_url);
- $alt = ' '.$ibx_url;
} else {
$ibx_url = $upfx;
$alt = '';
@@ -282,7 +310,7 @@ possible to have multiple root commits when merging independent histories.
Every commit references one top-level tree object.
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
@@ -312,7 +340,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);
}
@@ -333,7 +361,7 @@ 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);
}
@@ -359,17 +387,29 @@ sub show_tree_result ($$) {
my @ent = split(/\0/, $$bref);
my $qp = delete $ctx->{qp};
my $l = $ctx->{-linkify} //= PublicInbox::Linkify->new;
- my $pfx = $qp->{b};
+ 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) {
- my $x = ascii_html($pfx);
- $pfx .= '/';
- $$bref .= qq( path: $x\n);
+ $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);
+ my ($x, $m, $t, $oid, $sz, $f, $n, $gitlink);
$$bref .= "\n size name";
for (@ent) {
($x, $f) = split(/\t/, $_, 2);
@@ -380,27 +420,31 @@ sub show_tree_result ($$) {
$n = ascii_html($f);
if ($m eq 'g') { # gitlink submodule commit
$$bref .= "\ng\t\t$n @ commit$oid";
+ $gitlink = 1;
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 .= qq(\n$m\t$sz\t$n);
}
$$bref .= dbg_log($ctx);
$$bref .= <glossary
+
glossary
--------
Tree objects belong to commits or other tree objects. Trees may
-reference blobs, sub-trees, or commits of submodules.
+reference blobs, sub-trees, or (rarely) 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.
+EOM
+
+ $$bref .= <Commit objects may be stored in trees to reference submodules.
@@ -409,7 +453,7 @@ EOM
html_page($ctx, 200, $$bref);
}
-sub show_tree ($$) {
+sub show_tree ($$) { # also used by RepoTree
my ($ctx, $res) = @_;
my ($git, $oid, undef, $size) = @$res;
$size > $MAX_SIZE and return html_page($ctx, 200,
@@ -450,44 +494,55 @@ 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;
- }
+ do_cat_async($ctx, \&show_tag_result, $oid);
}
# 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));
+ $res or return html_page($ctx, 404, 'Not found', dbg_log($ctx));
+ ref($res) eq 'ARRAY' or
+ return html_page($ctx, 500, 'Internal error', dbg_log($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 = "(raw)";
+ my $fn = $di->{path_b} // $hints->{path_b};
+ my $paths = $ctx->{-paths} //= do {
+ my $path = to_filename($fn // 'blob');
+ my $raw_more = qq[(raw)];
+ my @def;
+
+ # XXX not sure if this is the correct wording
+ if (defined($fn)) {
+ $raw_more .= qq(
+name: ${\ascii_html($fn)} \t # note: path name is non-authoritative(*));
+ $def[0] = "
" .
+'(*) Git path names are given by the tree(s) the blob belongs to.
+ Blobs themselves have no identifier aside from the hash of its contents.'.
+qq(^);
+ }
+ [ $path, $raw_more, @def ];
+ };
+ $ctx->{-q_value_html} //= do {
+ my $s = defined($fn) ? 'dfn:'.ascii_html($fn).' ' : '';
+ $s.'dfpost:'.substr($oid, 0, 7);
+ };
+
if ($size > $MAX_SIZE) {
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
+blob $oid $size bytes $paths->[1]
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;
- }
+ do_cat_async($ctx, \&show_blob, $oid);
}
sub show_blob { # git->cat_async callback
@@ -505,10 +560,10 @@ sub show_blob { # git->cat_async callback
return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]);
}
- my ($path, $raw_link) = @{delete $ctx->{-paths}};
+ my ($path, $raw_more, @def) = @{delete $ctx->{-paths}};
$bin and return html_page($ctx, 200,
"blob $oid $size bytes (binary)" .
- " $raw_link
".dbg_log($ctx));
+ " $raw_more".dbg_log($ctx));
# TODO: detect + convert to ensure validity
utf8::decode($$blob);
@@ -524,7 +579,7 @@ sub show_blob { # git->cat_async callback
}
# using some of the same CSS class names and ids as cgit
- my $x = "blob $oid $size bytes $raw_link
" .
+ my $x = "blob $oid $size bytes $raw_more
" .
"
".
"";
# scratchpad in this loop is faster here than `printf $zfh':
@@ -532,7 +587,7 @@ sub show_blob { # git->cat_async callback
$x .= ' | '. # pad for non-CSS users
"";
html_page($ctx, 200, $x, $ctx->{-linkify}->linkify_2($$blob),
- '
'.dbg_log($ctx));
+ ''.dbg_log($ctx), @def);
}
# GET /$INBOX/$GIT_OBJECT_ID/s/
@@ -547,7 +602,10 @@ sub show ($$;$) {
}
$ctx->{fn} = $fn;
$ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1);
- open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!";
+ unless ($ctx->{lh}) {
+ open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or
+ die "open: $!";
+ }
my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
\&solve_result, $ctx);
$solver->{gits} //= [ $ctx->{git} ];