From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 4/8] viewvcs: show commit titles for parent commits
Date: Tue, 23 Aug 2022 08:31:59 +0000 [thread overview]
Message-ID: <20220823083203.1128993-5-e@80x24.org> (raw)
In-Reply-To: <20220823083203.1128993-1-e@80x24.org>
It's hard to know which commit I'm following a link to without
having the title of the commit handy.
---
lib/PublicInbox/ViewVCS.pm | 36 +++++++++++++++++++++++++++---------
1 file changed, 27 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index a73fbf0f..2c447909 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -32,7 +32,7 @@ my $hl = eval {
my %QP_MAP = ( A => 'oid_a', a => 'path_a', b => 'path_b' );
our $MAX_SIZE = 1024 * 1024; # TODO: configurable
my $BIN_DETECT = 8000; # same as git
-my $SHOW_FMT = '--pretty=format:'.join('%n', '%H', '%T', '%P', '%s',
+my $SHOW_FMT = '--pretty=format:'.join('%n', '%H', '%T', '%P', '%p', '%s',
'%an <%ae>%x09%ai', '%cn <%ce>%x09%ci', '%b%x00');
sub html_page ($$$) {
@@ -93,6 +93,17 @@ sub show_other_result ($$) {
html_page($ctx, 200, $bref);
}
+sub cmt_title { # git->cat_async callback
+ my ($bref, $oid, $type, $size, $pt) = @_;
+ utf8::decode($$bref);
+ if ($$bref =~ /\r?\n\r?\n([^\r\n]+)\r?\n?/) {
+ push @$pt, $1;
+ ascii_html($pt->[-1]);
+ } else {
+ push @$pt, ''; # need a placeholder if blank commit
+ }
+}
+
sub show_commit_result ($$) {
my ($bref, $ctx) = @_;
my ($qsp_err, $logref, $tmp) = @$ctx{qw(-qsp_err -logref -tmp)};
@@ -106,7 +117,7 @@ sub show_commit_result ($$) {
my $l = $ctx->{-linkify} = PublicInbox::Linkify->new;
open my $fh, '<:utf8', "$tmp/h" or die "open $tmp/h: $!";
chop(my $buf = do { local $/ = "\0"; <$fh> });
- my ($H, $T, $P, $s, $au, $co, $bdy) = split(/\n/, $buf, 7);
+ my ($H, $T, $P, $p, $s, $au, $co, $bdy) = split(/\n/, $buf, 8);
chomp $bdy;
# try to keep author and committer dates lined up
my $x = length($au) - length($co);
@@ -120,13 +131,19 @@ sub show_commit_result ($$) {
$_ = ascii_html($_) for ($au, $co);
$_ = $l->to_html($_) for ($s, $bdy);
$ctx->{-title_html} = $s;
- my @p = split(/ /, $P);
- if (@p == 1) {
- $P = qq(\n parent <a href="$upfx$P/s/">$P</a>);
- } elsif (@p > 1) {
- $P = qq(\n parents <a href="$upfx$p[0]/s/">$p[0]</a>\n);
- shift @p;
- $P .= qq( <a href="$upfx$_/s/">$_</a>\n) for @p;
+ my @P = split(/ /, $P);
+ my @p = split(/ /, $p); # abbreviated
+ my @pt;
+ my $git = delete $ctx->{code_git};
+ $git->cat_async($_, \&cmt_title, \@pt) for @P;
+ $git->cat_async_wait;
+ $_ = qq(<a href="$upfx$_/s/">).shift(@p).'</a> '.shift(@pt) for @P;
+ if (@P == 1) {
+ $P = qq(\n parent $P[0]);
+ } elsif (@P > 1) {
+ $P = qq(\n parents $P[0]\n);
+ shift @P;
+ $P .= qq( $_\n) for @P;
chop $P;
} else { # root commit
$P = ' (root commit)';
@@ -206,6 +223,7 @@ sub show_commit ($$$$) {
$ctx->{-logref} = $logref;
$ctx->{-tmp} = $tmp;
$ctx->{env}->{'qspawn.wcb'} = delete $ctx->{-wcb};
+ $ctx->{code_git} = $git;
$qsp->psgi_qx($ctx->{env}, undef, \&show_commit_result, $ctx);
}
next prev parent reply other threads:[~2022-08-23 8:32 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-23 8:31 [PATCH 0/8] www: diff viewing enhancements Eric Wong
2022-08-23 8:31 ` [PATCH 1/8] view: generate query in single-message and commit views Eric Wong
2022-08-24 1:09 ` Kyle Meyer
2022-08-23 8:31 ` [PATCH 2/8] viewdiff: linkify diffstats for non-format-patch emails Eric Wong
2022-08-23 8:31 ` [PATCH 3/8] viewvcs: remove patchid line from commit header Eric Wong
2022-08-23 8:31 ` Eric Wong [this message]
2022-08-23 8:32 ` [PATCH 5/8] viewvcs: separate email and date with spaces Eric Wong
2022-08-23 8:32 ` [PATCH 6/8] ibx_async_cat: access ->{git} directly Eric Wong
2022-08-23 8:32 ` [PATCH 7/8] gzip_filter: ->zmore and ->zflush support multiple args Eric Wong
2022-08-23 8:32 ` [PATCH 8/8] viewvcs: don't wait on slow disks for git commit titles Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220823083203.1128993-5-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).