From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 3/3] www_coderepo: /tree/ 404s search git history
Date: Thu, 12 Jan 2023 14:14:35 +0000 [thread overview]
Message-ID: <20230112141435.1924376-4-e@80x24.org> (raw)
In-Reply-To: <20230112141435.1924376-1-e@80x24.org>
Displaying git trees over the web with pathnames in the URLs
have the unfortunate consequence of URLs getting out-of-date
if files are renamed or deleted from the latest tree.
We can utilize `git log' here to search history and find the
commit which led to the rename or deletion. Of course, we'll
show a suitable command to the user as well, another small
step towards covertly teaching users the git CLI :>
`git log' is not especially fast, here, but Qspawn limiters can
do their job and renames and deletions aren't too common in most
codebases.
---
lib/PublicInbox/RepoTree.pm | 42 ++++++++++++++++++++++++++++++++++++-
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/lib/PublicInbox/RepoTree.pm b/lib/PublicInbox/RepoTree.pm
index 7f2ff206..5b502a45 100644
--- a/lib/PublicInbox/RepoTree.pm
+++ b/lib/PublicInbox/RepoTree.pm
@@ -7,11 +7,50 @@ use v5.12;
use PublicInbox::ViewDiff qw(uri_escape_path);
use PublicInbox::GitAsyncCat;
use PublicInbox::WwwStatic qw(r);
+use PublicInbox::Qspawn;
+use PublicInbox::WwwStream qw(html_oneshot);
+use PublicInbox::Hval qw(ascii_html);
+
+sub rd_404_log {
+ my ($bref, $ctx) = @_;
+ my $path = $ctx->{-q_value_html} = ascii_html($ctx->{-path});
+ my $tip = 'HEAD';
+ $tip = ascii_html($ctx->{qp}->{h}) if defined($ctx->{qp}->{h});
+ PublicInbox::WwwStream::html_init($ctx);
+ my $zfh = $ctx->{zfh};
+ print $zfh "<pre>\$ git log -1 $tip -- $path\n";
+ if ($$bref eq '') {
+ say $zfh "found no record of `$path' in git history";
+ $ctx->{-has_srch} and
+ say $zfh 'perhaps try searching mail (above)';
+ } else {
+ my ($H, $h, $s_as) = split(/ /, $$bref, 3);
+ utf8::decode($s_as);
+ my $x = uri_escape_path($ctx->{-path});
+ $s_as = ascii_html($s_as);
+ print $zfh <<EOM;
+found last record of `$path' in the following commit:
+<a href="$ctx->{-upfx}$H/s/?b=$x">$h</a> $s_as
+EOM
+ }
+ delete($ctx->{-wcb})->($ctx->html_done);
+}
+
+sub find_missing {
+ my ($ctx) = @_;
+ my $cmd = ['git', "--git-dir=$ctx->{git}->{git_dir}",
+ qw(log --no-color -1), '--pretty=%H %h %s (%as)' ];
+ push @$cmd, $ctx->{qp}->{h} if defined($ctx->{qp}->{h});
+ push @$cmd, '--';
+ push @$cmd, $ctx->{-path} if $ctx->{-path} ne '';
+ my $qsp = PublicInbox::Qspawn->new($cmd);
+ $qsp->psgi_qx($ctx->{env}, undef, \&rd_404_log, $ctx);
+}
sub tree_30x { # git check_async callback
my ($oid, $type, $size, $ctx) = @_;
+ return find_missing($ctx) if $type eq 'missing';
my $wcb = delete $ctx->{-wcb};
- return $wcb->(r(404)) if $type eq 'missing';
my $u = $ctx->{git}->base_url($ctx->{env});
my $path = uri_escape_path(delete $ctx->{-path});
$u .= "$oid/s/?b=$path";
@@ -23,6 +62,7 @@ sub srv_tree {
my ($ctx, $path) = @_;
return if index($path, '//') >= 0 || index($path, '/') == 0;
my $tip = $ctx->{qp}->{h} // 'HEAD';
+ $ctx->{-upfx} = '../' x (($path =~ tr!/!/!) + 1);
$path =~ s!/\z!!;
my $obj = $ctx->{-obj} = "$tip:$path";
$ctx->{-path} = $path;
next prev parent reply other threads:[~2023-01-12 14:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-01-12 14:14 [PATCH 0/3] coderepo: cgit-compatible /tree/ redirect Eric Wong
2023-01-12 14:14 ` [PATCH 1/3] www_stream: coderepo-specific top bar Eric Wong
2023-01-12 14:14 ` [PATCH 2/3] www_coderepo: /tree/ redirects to /$OID/s/ Eric Wong
2023-01-12 14:14 ` Eric Wong [this message]
2023-01-12 14:19 ` [PATCH 3/3] www_coderepo: /tree/ 404s search git history 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=20230112141435.1924376-4-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).