From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 1/4] www_coderepo: handle "?h=$tip" in summary view
Date: Tue, 10 Jan 2023 11:49:18 +0000 [thread overview]
Message-ID: <20230110114921.2668377-2-e@80x24.org> (raw)
In-Reply-To: <20230110114921.2668377-1-e@80x24.org>
This makes sense at least as far as the README and `git log' output goes.
We'll also add the `b=' query parameter to the $OID/s/ href for
the README blob.
---
lib/PublicInbox/WwwCoderepo.pm | 26 +++++++++++++++++++++-----
1 file changed, 21 insertions(+), 5 deletions(-)
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 7f8b3459..53126e19 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -15,6 +15,7 @@ use PublicInbox::Git;
use PublicInbox::GitAsyncCat;
use PublicInbox::WwwStream;
use PublicInbox::Hval qw(ascii_html);
+use PublicInbox::ViewDiff qw(uri_escape_path);
use PublicInbox::RepoSnapshot;
use PublicInbox::RepoAtom;
@@ -75,6 +76,10 @@ sub summary_finish {
# git log
my @r = split(/\n/s, pop(@x) // '');
my $last = pop(@r) if scalar(@r) > $ctx->{wcr}->{summary_log};
+ my $tip_html = '';
+ if (defined(my $tip = $ctx->{qp}->{h})) {
+ $tip_html .= ' '.ascii_html($tip).' --';
+ }
print $zfh <<EOM;
<pre>
<a
@@ -83,7 +88,7 @@ href='#heads'>heads</a> <a
href='#tags'>tags</a>
<a
-id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'
+id=log>\$</a> git log --pretty=format:'%h %s (%cs)%d'$tip_html
EOM
for (@r) {
my $d; # decorations
@@ -102,8 +107,10 @@ EOM
if ($bref) {
my $l = PublicInbox::Linkify->new;
$$bref =~ s/\s*\z//sm;
+ my (undef, $path) = split(/:/, $ref_path, 2); # HEAD:README
print $zfh "\n<a id=readme>\$</a> " .
- "git cat-file blob <a href=./$oid/s/>",
+ qq(git cat-file blob <a href="./$oid/s/?b=) .
+ ascii_html(uri_escape_path($path)) . q(">).
ascii_html($ref_path), "</a>\n",
$l->to_html($$bref), '</pre><hr><pre>';
}
@@ -180,16 +187,25 @@ sub set_readme { # git->cat_async callback
sub summary {
my ($self, $ctx) = @_;
$ctx->{wcr} = $self;
+ my $tip = $ctx->{qp}->{h}; # same as cgit
+ if (defined $tip && $tip eq '') {
+ delete $ctx->{qp}->{h};
+ undef($tip);
+ }
my $nb = $self->{summary_branches} + 1;
my $nt = $self->{summary_tags} + 1;
my $nl = $self->{summary_log} + 1;
- my $qsp = PublicInbox::Qspawn->new([qw(/bin/sh -c),
+
+ my @cmd = (qw(/bin/sh -c),
"$EACH_REF --count=$nb refs/heads; echo && " .
"$EACH_REF --count=$nt refs/tags; echo && " .
- "git log -$nl --pretty=format:'%d %H %h %cs %s' --" ],
+ qq(git log -$nl --pretty=format:'%d %H %h %cs %s' "\$@" --));
+ push @cmd, '--', $tip if defined($tip);
+ my $qsp = PublicInbox::Qspawn->new(\@cmd,
{ GIT_DIR => $ctx->{git}->{git_dir} });
$qsp->{qsp_err} = \($ctx->{-qsp_err} = '');
- my @try = qw(HEAD:README HEAD:README.md); # TODO: configurable
+ $tip //= 'HEAD';
+ my @try = ("$tip:README", "$tip:README.md"); # TODO: configurable
$ctx->{-nr_readme_tries} = [ @try ];
$ctx->{git}->cat_async($_, \&set_readme, $ctx) for @try;
if ($ctx->{env}->{'pi-httpd.async'}) {
next prev parent reply other threads:[~2023-01-10 11:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-10 11:49 [PATCH 0/4] www: more coderepo tweaks Eric Wong
2023-01-10 11:49 ` Eric Wong [this message]
2023-01-10 11:49 ` [PATCH 2/4] www_coderepo: show tree root as "(root)" Eric Wong
2023-01-10 11:49 ` [PATCH 3/4] viewvcs: update comment about show_other_result Eric Wong
2023-01-10 11:49 ` [PATCH 4/4] config: use inbox names to map inboxes <-> coderepos 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=20230110114921.2668377-2-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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
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).