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.
@@ -482,18 +501,36 @@ sub show_tag ($$) {
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 $fn = $di->{path_b} // $hints->{path_b};
my $paths = $ctx->{-paths} //= do {
- my $path = to_filename($di->{path_b}//$hints->{path_b}//'blob');
+ my $path = to_filename($fn // 'blob');
my $raw_more = qq[(raw)];
- [ $path, $raw_more ];
+ 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) {
@@ -523,7 +560,7 @@ sub show_blob { # git->cat_async callback
return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]);
}
- my ($path, $raw_more) = @{delete $ctx->{-paths}};
+ my ($path, $raw_more, @def) = @{delete $ctx->{-paths}};
$bin and return html_page($ctx, 200,
"blob $oid $size bytes (binary)" .
" $raw_more
".dbg_log($ctx));
@@ -550,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/
@@ -565,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} ];