lib/PublicInbox/SolverGit.pm | 8 ++++---- lib/PublicInbox/ViewVCS.pm | 1 + lib/PublicInbox/WwwCoderepo.pm | 4 ++++ diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm index b723b48a9f6545ef7724b5605666a53ab3d7b361..80bb0a178fb540f507a596246574a45416846872 100644 --- a/lib/PublicInbox/SolverGit.pm +++ b/lib/PublicInbox/SolverGit.pm @@ -639,7 +639,7 @@ } # 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 @@ # so user_cb never references the SolverGit object 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 b0f58455018b0ea03d97ddd42a377cccd927fd82..6ada03e6fb1d5d4aa2a45a26a63676284d7cb165 100644 --- a/lib/PublicInbox/ViewVCS.pm +++ b/lib/PublicInbox/ViewVCS.pm @@ -484,6 +484,7 @@ $ctx->{-tmp} = File::Temp->newdir("solver.$oid_b-XXXX", TMPDIR => 1); 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 4b1a4f9baeb2b00ad03e84a35122605e58ecaa81..e0fc90459d209b1a7299a550f09235723880d360 100644 --- a/lib/PublicInbox/WwwCoderepo.pm +++ b/lib/PublicInbox/WwwCoderepo.pm @@ -171,6 +171,10 @@ PublicInbox::GitHTTPBackend::serve($ctx->{env},$git,$2); } $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});