From bc54a149d08e9eac58a14c77b3df29fdb2f07fb8 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Tue, 14 Feb 2023 13:17:39 +0000
Subject: [PATCH] www_coderepo: handle unborn/dead branches in summary
We need to account for `git log' showing nothing for invalid
branches and continue to render properly. We'll also quiet down
`git log' stderr to avoid cluttering stderr, too.
---
lib/PublicInbox/WwwCoderepo.pm | 16 ++++++++--------
t/solver_git.t | 18 ++++++++----------
2 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 8a490b6c..52ab6e48 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -123,17 +123,16 @@ sub _refs_tags_link {
sub summary_finish {
my ($ctx) = @_;
my $wcb = delete($ctx->{env}->{'qspawn.wcb'}) or return; # already done
- my @x = split(/\n\n/sm, delete($ctx->{-each_refs}));
+ my @x = split(/\n\n/sm, delete($ctx->{-each_refs}), 3);
PublicInbox::WwwStream::html_init($ctx);
my $zfh = $ctx->zfh;
# git log
- my @r = split(/\n/s, pop(@x) // '');
+ my @r = split(/\n/s, pop(@x));
my $last = scalar(@r) > $ctx->{wcr}->{summary_log} ? pop(@r) : undef;
my $tip_html = '';
- if (defined(my $tip = $ctx->{qp}->{h})) {
- $tip_html .= ' '.ascii_html($tip).' --';
- }
+ my $tip = $ctx->{qp}->{h};
+ $tip_html .= ' '.ascii_html($tip).' --' if defined $tip;
print $zfh <<EOM;
<pre><a id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'$tip_html
EOM
@@ -146,7 +145,7 @@ EOM
" (", $cs, ")\n";
print $zfh "\t(", ascii_html($d), ")\n" if $d;
}
- print $zfh "# no commits, yet\n" if !@r;
+ print $zfh '# no commits in `', ($tip//'HEAD'),"', yet\n\n" if !@r;
print $zfh "...\n" if $last;
# README
@@ -216,9 +215,10 @@ sub summary {
"$EACH_REF --count=$nb refs/heads; echo && " .
"$EACH_REF --count=$nt refs/tags; echo && " .
qq(git log -$nl --pretty=format:'%d %H %h %cs %s' "\$@" --));
- push @cmd, '--', $tip if defined($tip);
+ push @cmd, 'git', $tip if defined($tip);
my $qsp = PublicInbox::Qspawn->new(\@cmd,
- { GIT_DIR => $ctx->{git}->{git_dir} });
+ { GIT_DIR => $ctx->{git}->{git_dir} },
+ { quiet => 1, 2 => $self->{log_fh} });
$qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
$tip //= 'HEAD';
my @try = ("$tip:README", "$tip:README.md"); # TODO: configurable
diff --git a/t/solver_git.t b/t/solver_git.t
index 79672398..c65d9785 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -330,18 +330,16 @@ EOF
defined($ENV{PLACK_TEST_EXTERNALSERVER_URI}) or
open STDERR, '>&', $olderr or xbail "open: $!";
is($res->code, 200, 'coderepo summary (binfoo)');
- if (ok(-s "$tmpdir/stderr.log")) {
- open my $fh, '<', "$tmpdir/stderr.log" or xbail $!;
- my $s = do { local $/; <$fh> };
- open $fh, '>', "$tmpdir/stderr.log" or xbail $!;
- ok($s =~ s/^fatal: your current branch.*?\n//sm,
- 'got current branch warning');
- ok($s =~ s/^.*? exit status=[1-9]+\n\z//sm,
- 'got exit status warning');
- is($s, '', 'no unexpected warnings on empty coderepo');
- }
+ ok(!-s "$tmpdir/stderr.log");
$res = $cb->(GET('/public-inbox/'));
is($res->code, 200, 'coderepo summary (public-inbox)');
+
+ my $tip = 'invalid-'.int(rand(0xdeadbeef));
+ $res = $cb->(GET('/public-inbox/?h='.$tip));
+ is($res->code, 200, 'coderepo summary on dead branch');
+ like($res->content, qr/no commits in `\Q$tip\E', yet/,
+ 'lack of commits noted');
+
$res = $cb->(GET('/public-inbox'));
is($res->code, 301, 'redirected');
--
2.51.0