Merge remote-tracking branch 'origin/danga-bundle'

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

diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 97da7956a26d2c37cdf5e2a23067e30ae800e5bc..3841c56719932a7c5ea4988b38bed549c3c9200d 100644 (file)
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -62,14 +62,15 @@ sub ERR ($$) {
        die $err;
 }
 
-# look for existing blobs already in git repos
+# look for existing objects already in git repos
 sub solve_existing ($$) {
        my ($self, $want) = @_;
        my $oid_b = $want->{oid_b};
+       my $have_hints = scalar keys %$want > 1;
        my @ambiguous; # Array of [ git, $oids]
        foreach my $git (@{$self->{gits}}) {
                my ($oid_full, $type, $size) = $git->check($oid_b);
-               if (defined($type) && $type eq 'blob') {
+               if (defined($type) && (!$have_hints || $type eq 'blob')) {
                        return [ $git, $oid_full, $type, int($size) ];
                }
 
@@ -84,7 +85,8 @@ sub solve_existing ($$) {
                # push @ambiguous, [ $git, @oids ];
 
                dbg($self, "`$oid_b' ambiguous in " .
-                               join("\n\t", $git->pub_urls) . "\n" .
+                               join("\n\t", $git->pub_urls($self->{psgi_env}))
+                                . "\n" .
                                join('', map { "$_ blob\n" } @oids));
        }
        scalar(@ambiguous) ? \@ambiguous : undef;
@@ -302,6 +304,26 @@ sub extract_old_mode ($) {
        '100644';
 }
 
+sub do_finish ($$) {
+       my ($self, $user_cb) = @_;
+       my $found = $self->{found};
+       my $oid_want = $self->{oid_want};
+       if (my $exists = $found->{$oid_want}) {
+               return $user_cb->($exists);
+       }
+
+       # let git disambiguate if oid_want was too short,
+       # but long enough to be unambiguous:
+       my $tmp_git = $self->{tmp_git};
+       if (my @res = $tmp_git->check($oid_want)) {
+               return $user_cb->($found->{$res[0]});
+       }
+       if (my $err = $tmp_git->last_check_err) {
+               dbg($self, $err);
+       }
+       $user_cb->(undef);
+}
+
 sub do_step ($) {
        my ($self) = @_;
        eval {
@@ -323,8 +345,8 @@ sub do_step ($) {
                # our result: (which may be undef)
                # Other steps may call user_cb to terminate prematurely
                # on error
-               } elsif (my $ucb = delete($self->{user_cb})) {
-                       $ucb->($self->{found}->{$self->{oid_want}});
+               } elsif (my $user_cb = delete($self->{user_cb})) {
+                       do_finish($self, $user_cb);
                } else {
                        die 'about to call user_cb twice'; # Oops :x
                }
@@ -460,10 +482,11 @@ sub resolve_patch ($$) {
                die "Loop detected solving $cur_want\n";
        }
        if (my $existing = solve_existing($self, $want)) {
+               my ($found_git, undef, $type, undef) = @$existing;
                dbg($self, "found $cur_want in " .
-                       join("\n", $existing->[0]->pub_urls));
+                       join("\n", $found_git->pub_urls($self->{psgi_env})));
 
-               if ($cur_want eq $self->{oid_want}) { # all done!
+               if ($cur_want eq $self->{oid_want} || $type ne 'blob') {
                        eval { delete($self->{user_cb})->($existing) };
                        die "E: $@" if $@;
                        return;
@@ -520,6 +543,7 @@ sub new {
 }
 
 # recreate $oid_want using $hints
+# hints keys: path_a, path_b, oid_a
 # Calls {user_cb} with: [ ::Git object, oid_full, type, size, di (diff_info) ]
 # with found object, or undef if nothing was found
 # Calls {user_cb} with a string error on fatal errors
@@ -538,7 +562,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.tmp-XXXXXXXX', TMPDIR => 1);
+       $self->{tmp} = File::Temp->newdir("solver.$oid_want-XXXXXXXX", TMPDIR => 1);
 
        dbg($self, "solving $oid_want ...");
        my $step_cb = step_cb($self);