about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2022-10-04 19:12:36 +0000
committerEric Wong <e@80x24.org>2022-10-05 21:15:26 +0000
commit87e742835126e37d8f09c35321f9dd07f233dd45 (patch)
tree02b8b6b38a55db5af277a23a803f477f36afdb5d
parent6dec9bf8c0e1b859703d7a5dfb87052cf4e87846 (diff)
downloadpublic-inbox-87e742835126e37d8f09c35321f9dd07f233dd45.tar.gz
Just reusing ViewVCS::show, since encoding refname and pathnames
into things just makes things slower.
-rw-r--r--lib/PublicInbox/SolverGit.pm8
-rw-r--r--lib/PublicInbox/ViewVCS.pm1
-rw-r--r--lib/PublicInbox/WwwCoderepo.pm4
3 files changed, 9 insertions, 4 deletions
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index b723b48a..80bb0a17 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -639,7 +639,7 @@ sub resolve_patch ($$) {
 
         # scan through inboxes to look for emails which results in
         # the oid we want:
-        my $ibx = shift(@{$want->{try_ibxs}}) or die 'BUG: {try_ibxs} empty';
+        my $ibx = shift(@{$want->{try_ibxs}}) or return done($self, undef);
         if (my $msgs = find_smsgs($self, $ibx, $want)) {
                 $want->{try_smsgs} = $msgs;
                 $want->{cur_ibx} = $ibx;
@@ -654,14 +654,14 @@ sub resolve_patch ($$) {
 sub new {
         my ($class, $ibx, $user_cb, $uarg) = @_;
 
-        bless {
-                gits => $ibx->{-repo_objs},
+        bless { # $ibx is undef if coderepo only (see WwwCoderepo)
+                gits => $ibx ? $ibx->{-repo_objs} : undef,
                 user_cb => $user_cb,
                 uarg => $uarg,
                 # -cur_di, -qsp_err, -msg => temp fields for Qspawn callbacks
 
                 # TODO: config option for searching related inboxes
-                inboxes => [ $ibx ],
+                inboxes => $ibx ? [ $ibx ] : [],
         }, $class;
 }
 
diff --git a/lib/PublicInbox/ViewVCS.pm b/lib/PublicInbox/ViewVCS.pm
index b0f58455..6ada03e6 100644
--- a/lib/PublicInbox/ViewVCS.pm
+++ b/lib/PublicInbox/ViewVCS.pm
@@ -484,6 +484,7 @@ sub show ($$;$) {
         open $ctx->{lh}, '+>>', "$ctx->{-tmp}/solve.log" or die "open: $!";
         my $solver = PublicInbox::SolverGit->new($ctx->{ibx},
                                                 \&solve_result, $ctx);
+        $solver->{gits} //= [ $ctx->{git} ];
         $solver->{tmp} = $ctx->{-tmp}; # share tmpdir
         # PSGI server will call this immediately and give us a callback (-wcb)
         sub {
diff --git a/lib/PublicInbox/WwwCoderepo.pm b/lib/PublicInbox/WwwCoderepo.pm
index 4b1a4f9b..e0fc9045 100644
--- a/lib/PublicInbox/WwwCoderepo.pm
+++ b/lib/PublicInbox/WwwCoderepo.pm
@@ -171,6 +171,10 @@ sub srv { # endpoint called by PublicInbox::WWW
         }
         $path_info =~ m!\A/(.+?)/\z! and
                 ($ctx->{git} = $self->{"\0$1"}) and return summary($self, $ctx);
+        $path_info =~ m!\A/(.+?)/([a-f0-9]+)/s/\z! and
+                        ($ctx->{git} = $self->{"\0$1"}) and
+                return PublicInbox::ViewVCS::show($ctx, $2);
+
         if ($path_info =~ m!\A/(.+?)\z! and ($git = $self->{"\0$1"})) {
                 my $qs = $ctx->{env}->{QUERY_STRING};
                 my $url = $git->base_url($ctx->{env});