X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=lib%2FPublicInbox%2FViewVCS.pm;h=5fd466106f96ae432038c4279bc6c00292c94456;hb=HEAD;hp=a5545bcd344aba5bda386ee2274dd081be740e3c;hpb=d03cb41b664aa6cd72fd87f7f88a54e80b976960;p=public-inbox.git diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm index a5545bcd..5fd46610 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -25,7 +25,8 @@ 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; @@ -48,7 +49,7 @@ my %GIT_MODE = ( sub html_page ($$;@) { my ($ctx, $code) = @_[0, 1]; my $wcb = delete $ctx->{-wcb}; - $ctx->{-upfx} = '../../'; # from "/$INBOX/$OID/s/" + $ctx->{-upfx} //= '../../'; # from "/$INBOX/$OID/s/" my $res = html_oneshot($ctx, $code, @_[2..$#_]); $wcb ? $wcb->($res) : $res; } @@ -61,9 +62,13 @@ sub dbg_log ($) { return '
debug log seek error'; } $log = do { local $/; <$log> } // do { - warn "readline(log): $!"; - return '
debug log read error'; + if (!eof($log)) { + warn "readline(log): $!"; + return '
debug log read error'; + } + ''; }; + return '' if $log eq ''; $ctx->{-linkify} //= PublicInbox::Linkify->new; "
debug log:\n\n". $ctx->{-linkify}->to_html($log).''; @@ -99,11 +104,11 @@ sub stream_large_blob ($$) { 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 +sub show_other_result ($$) { # future-proofing my ($bref, $ctx) = @_; if (my $qsp_err = delete $ctx->{-qsp_err}) { return html_page($ctx, 500, dbg_log($ctx) . @@ -123,6 +128,27 @@ sub cmt_title { # git->cat_async callback cmt_finalize($ctx); } +sub do_cat_async { + my ($ctx, $cb, @req) = @_; + # favor git(1) over Gcf2 (libgit2) for SHA-256 support + $ctx->{git}->cat_async($_, $cb, $ctx) for @req; + if ($ctx->{env}->{'pi-httpd.async'}) { + PublicInbox::GitAsyncCat::watch_cat($ctx->{git}); + } else { # synchronous, generic PSGI + $ctx->{git}->cat_async_wait; + } +} + +sub do_check_async { + my ($ctx, $cb, @req) = @_; + if ($ctx->{env}->{'pi-httpd.async'}) { + async_check($ctx, $_, $cb, $ctx) for @req; + } else { # synchronous, generic PSGI + $ctx->{git}->check_async($_, $cb, $ctx) for @req; + $ctx->{git}->check_async_wait; + } +} + sub show_commit_start { # ->psgi_qx callback my ($bref, $ctx) = @_; if (my $qsp_err = delete $ctx->{-qsp_err}) { @@ -136,29 +162,46 @@ sub show_commit_start { # ->psgi_qx callback 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 - if ($ctx->{env}->{'pi-httpd.async'}) { - for (@{$ctx->{-cmt_P}}) { - ibx_async_cat($ctx, $_, \&cmt_title, $ctx); + do_cat_async($ctx, \&cmt_title, @{$ctx->{-cmt_P}}); +} + +sub ibx_url_for { + my ($ctx) = @_; + $ctx->{ibx} and return; # fall back to $upfx + $ctx->{git} or die 'BUG: no {git}'; + if (my $ALL = $ctx->{www}->{pi_cfg}->ALL) { + if (defined(my $u = $ALL->base_url($ctx->{env}))) { + return wantarray ? ($u) : $u; } - } else { # synchronous - for (@{$ctx->{-cmt_P}}) { - $ctx->{git}->cat_async($_, \&cmt_title, $ctx); + } + my @ret; + if (my $ibx_names = $ctx->{git}->{ibx_names}) { + my $by_name = $ctx->{www}->{pi_cfg}->{-by_name}; + for my $name (@$ibx_names) { + my $ibx = $by_name->{$name} // do { + warn "inbox `$name' no longer exists\n"; + next; + }; + $ibx->isrch // next; + my $u = defined($ibx->{url}) ? + prurl($ctx->{env}, $ibx->{url}) : $name; + $u .= '/' if substr($u, -1) ne '/'; + push @ret, $u; } - $ctx->{git}->cat_async_wait; } + wantarray ? (@ret) : $ret[0]; } 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; @@ -168,53 +211,51 @@ sub cmt_finalize { $au =~ s/>/>$x/; } $_ = ascii_html($_) for ($au, $co); + my $ibx_url = ibx_url_for($ctx) // $upfx; $au =~ s!(> +)([0-9]{4,}-\S+ \S+)! my ($gt, $t) = ($1, $2); $t =~ tr/ :-//d; qq($gt$2) !e; - my $s = $ctx->{-linkify}->to_html(delete $ctx->{cmt_s}); - $ctx->{-title_html} = $s; + + $ctx->{-title_html} = $s = $ctx->{-linkify}->to_html($s); my ($P, $p, $pt) = delete @$ctx{qw(-cmt_P -cmt_p -cmt_pt)}; $_ = qq().shift(@$p).' '.shift(@$pt) for @$P; if (@$P == 1) { $x = qq{ ({cmt_f}.patch">patch)\n parent $P->[0]}; +href="$f.patch">patch)\n parent $P->[0]}; } elsif (@$P > 1) { - $x = qq(\n parents $P->[0]\n); + $x = qq(\n parents $P->[0]\n); shift @$P; $x .= qq( $_\n) for @$P; chop $x; } else { - $x = ' (root commit)'; + $x = ' (root commit)'; } PublicInbox::WwwStream::html_init($ctx); - $ctx->zmore(<
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 @@ -274,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); } @@ -295,12 +361,12 @@ 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, @@ -321,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 .= <+blob $oid $size bytes $paths->[1] EOM } + bless $ctx, 'PublicInbox::WwwStream'; # for DESTROY + $ctx->{git} = $git; + do_cat_async($ctx, \&show_blob, $oid); +} - 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, "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); @@ -342,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 .= <@@ -371,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, @@ -384,31 +466,90 @@ sub show_tree ($$) { $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 $1!; + + $$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, 'Commit objects may be stored in trees to reference submodules. ', $$bref, '', dbg_log($ctx)); +} + +sub show_tag ($$) { + my ($ctx, $res) = @_; + my ($git, $oid) = @$res; + $ctx->{git} = $git; + 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 -"$oid $type $size bytes $raw_link
$e".dbg_log($ctx)) } @@ -419,9 +560,10 @@ EOM return delete($ctx->{-wcb})->([200, $h, [ $$blob ]]); } + my ($path, $raw_more, @def) = @{delete $ctx->{-paths}}; $bin and return html_page($ctx, 200, - "
$oid $type $size bytes (binary)" . - " $raw_link".dbg_log($ctx)); + "
blob $oid $size bytes (binary)" . + " $raw_more".dbg_log($ctx)); # TODO: detect + convert to ensure validity utf8::decode($$blob); @@ -436,16 +578,16 @@ EOM $$blob = ascii_html($$blob); } - my $x = "
$oid $type $size bytes $raw_link" . + # using some of the same CSS class names and ids as cgit + my $x = "
blob $oid $size bytes $raw_more" . "
"; + # scratchpad in this loop is faster here than `printf $zfh': $x .= sprintf("% ${pad}u\n", $_) for (1..$nl); $x .= ' |
|