www_stream: extra link to mirroring information in the footer

[public-inbox.git] / lib / PublicInbox / SolverGit.pm

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index ae3997ca6d06e238176ec797f42965771dc444b6..b0cd0f2c20be67c596b130d923941918a1adcf0d 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 
 # "Solve" blobs which don't exist in git code repositories by
@@ -216,7 +216,7 @@ sub filename_query ($) {
 
 sub find_smsgs ($$$) {
        my ($self, $ibx, $want) = @_;
-       my $srch = $ibx->search or return;
+       my $srch = $ibx->isrch or return;
 
        my $post = $want->{oid_b} or die 'BUG: no {oid_b}';
        $post =~ /\A[a-f0-9]+\z/ or die "BUG: oid_b not hex: $post";
@@ -517,16 +517,16 @@ sub di_url ($$) {
 }
 
 sub retry_current {
-       # my ($self, $want) = @_;
-       push @{$_[0]->{todo}}, $_[1];
-       goto \&next_step # retry solve_existing
+       my ($self, $want) = @_;
+       push @{$self->{todo}}, $want;
+       next_step($self); # retry solve_existing
 }
 
-sub try_harder {
+sub try_harder ($$) {
        my ($self, $want) = @_;
 
        # do we have more inboxes to try?
-       goto \&retry_current if scalar @{$want->{try_ibxs}};
+       return retry_current($self, $want) if scalar @{$want->{try_ibxs}};
 
        my $cur_want = $want->{oid_b};
        if (length($cur_want) > $OID_MIN) { # maybe a shorter OID will work
@@ -534,7 +534,7 @@ sub try_harder {
                chop($cur_want);
                dbg($self, "retrying $want->{oid_b} as $cur_want");
                $want->{oid_b} = $cur_want;
-               goto \&retry_current; # retry with shorter abbrev
+               return retry_current($self, $want); # retry with shorter abbrev
        }
 
        dbg($self, "could not find $cur_want");
@@ -564,9 +564,9 @@ sub extract_diffs_done {
                        my $job = { oid_b => $src, path_b => $di->{path_a} };
                        push @{$self->{todo}}, $job;
                }
-               goto \&next_step; # onto the next todo item
+               return next_step($self); # onto the next todo item
        }
-       goto \&try_harder;
+       try_harder($self, $want);
 }
 
 sub extract_diff_async {
@@ -578,9 +578,8 @@ sub extract_diff_async {
                PublicInbox::Eml->new($bref)->each_part(\&extract_diff, $x, 1);
        }
 
-       scalar(@{$want->{try_smsgs}}) ?
-               retry_current($self, $want) :
-               extract_diffs_done($self, $want);
+       scalar(@{$want->{try_smsgs}}) ? retry_current($self, $want)
+                                       : extract_diffs_done($self, $want);
 }
 
 sub resolve_patch ($$) {
@@ -594,8 +593,7 @@ sub resolve_patch ($$) {
        if (my $msgs = $want->{try_smsgs}) {
                my $smsg = shift @$msgs;
                if ($self->{psgi_env}->{'pi-httpd.async'}) {
-                       return git_async_cat($want->{cur_ibx}->git,
-                                               $smsg->{blob},
+                       return ibx_async_cat($want->{cur_ibx}, $smsg->{blob},
                                                \&extract_diff_async,
                                                [$self, $want, $smsg]);
                } else {
@@ -605,7 +603,8 @@ sub resolve_patch ($$) {
                        }
                }
 
-               goto(scalar @$msgs ? \&retry_current : \&extract_diffs_done);
+               return scalar(@$msgs) ? retry_current($self, $want)
+                                       : extract_diffs_done($self, $want);
        }
 
        # see if we can find the blob in an existing git repo:
@@ -626,9 +625,9 @@ sub resolve_patch ($$) {
                        return;
                }
                mark_found($self, $cur_want, $existing);
-               goto \&next_step; # onto patch application
+               return next_step($self); # onto patch application
        } elsif ($existing > 0) {
-               goto \&retry_current;
+               return retry_current($self, $want);
        } else { # $existing == 0: we may retry if inbox scan (below) fails
                delete $want->{try_gits};
        }
@@ -640,9 +639,9 @@ sub resolve_patch ($$) {
                $want->{try_smsgs} = $msgs;
                $want->{cur_ibx} = $ibx;
                $self->{tmp_diffs} = [];
-               goto \&retry_current;
+               return retry_current($self, $want);
        }
-       goto \&try_harder;
+       try_harder($self, $want);
 }
 
 # this API is designed to avoid creating self-referential structures;
@@ -681,7 +680,7 @@ sub solve ($$$$$) {
        $self->{todo} = [ { %$hints, oid_b => $oid_want } ];
        $self->{patches} = []; # [ $di, $di, ... ]
        $self->{found} = {}; # { abbr => [ ::Git, oid, type, size, $di ] }
-       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXXXXXX", TMPDIR => 1);
+       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXX", TMPDIR => 1);
 
        dbg($self, "solving $oid_want ...");
        if (my $async = $env->{'pi-httpd.async'}) {