Merge branch 'jn/rerere-fail-on-auto-update-failure'

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index f8a75b190c860e3ae798565c28a5d9de81b7cdcf..8e4af7153eb8a8957bd4172e0c044c1bfc748ddb 100644 (file)
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1433,7 +1433,7 @@ sub check_author {
 }
 
 sub find_extra_svk_parents {
-       my ($self, $ed, $tickets, $parents) = @_;
+       my ($self, $tickets, $parents) = @_;
        # aha!  svk:merge property changed...
        my @tickets = split "\n", $tickets;
        my @known_parents;
@@ -1600,7 +1600,6 @@ sub tie_for_persistent_memoization {
                my %lookup_svn_merge_cache;
                my %check_cherry_pick2_cache;
                my %has_no_changes_cache;
-               my %_rev_list_cache;
 
                tie_for_persistent_memoization(\%lookup_svn_merge_cache,
                    "$cache_path/lookup_svn_merge");
@@ -1622,14 +1621,6 @@ sub tie_for_persistent_memoization {
                        SCALAR_CACHE => ['HASH' => \%has_no_changes_cache],
                        LIST_CACHE => 'FAULT',
                ;
-
-               tie_for_persistent_memoization(\%_rev_list_cache,
-                   "$cache_path/_rev_list");
-               memoize '_rev_list',
-                       SCALAR_CACHE => 'FAULT',
-                       LIST_CACHE => ['HASH' => \%_rev_list_cache],
-               ;
-
        }
 
        sub unmemoize_svn_mergeinfo_functions {
@@ -1639,7 +1630,6 @@ sub tie_for_persistent_memoization {
                Memoize::unmemoize 'lookup_svn_merge';
                Memoize::unmemoize 'check_cherry_pick2';
                Memoize::unmemoize 'has_no_changes';
-               Memoize::unmemoize '_rev_list';
        }
 
        sub clear_memoized_mergeinfo_caches {
@@ -1710,32 +1700,20 @@ sub mergeinfo_changes {
        my %minfo = map {split ":", $_ } split "\n", $mergeinfo_prop;
        my $old_minfo = {};
 
-       # Initialize cache on the first call.
-       unless (defined $self->{cached_mergeinfo_rev}) {
-               $self->{cached_mergeinfo_rev} = {};
+       my $ra = $self->ra;
+       # Give up if $old_path isn't in the repo.
+       # This is probably a merge on a subtree.
+       if ($ra->check_path($old_path, $old_rev) != $SVN::Node::dir) {
+               warn "W: ignoring svn:mergeinfo on $old_path, ",
+                       "directory didn't exist in r$old_rev\n";
+               return {};
        }
-
-       my $cached_rev = $self->{cached_mergeinfo_rev}{$old_path};
-       unless (defined $cached_rev && $cached_rev == $old_rev) {
-               my $ra = $self->ra;
-               # Give up if $old_path isn't in the repo.
-               # This is probably a merge on a subtree.
-               if ($ra->check_path($old_path, $old_rev) != $SVN::Node::dir) {
-                       warn "W: ignoring svn:mergeinfo on $old_path, ",
-                               "directory didn't exist in r$old_rev\n";
-                       return {};
-               }
-       }
-       my (undef, undef, $props) = $self->ra->get_dir($old_path, $old_rev);
+       my (undef, undef, $props) = $ra->get_dir($old_path, $old_rev);
        if (defined $props->{"svn:mergeinfo"}) {
                my %omi = map {split ":", $_ } split "\n",
                        $props->{"svn:mergeinfo"};
                $old_minfo = \%omi;
        }
-       $self->{cached_mergeinfo_rev}{$old_path} = $old_rev;
-
-       # Cache the new mergeinfo.
-       $self->{cached_mergeinfo_rev}{$path} = $rev;
 
        my %changes = ();
        foreach my $p (keys %minfo) {
@@ -1758,7 +1736,7 @@ sub mergeinfo_changes {
 # note: this function should only be called if the various dirprops
 # have actually changed
 sub find_extra_svn_parents {
-       my ($self, $ed, $mergeinfo, $parents) = @_;
+       my ($self, $mergeinfo, $parents) = @_;
        # aha!  svk:merge property changed...
 
        memoize_svn_mergeinfo_functions();
@@ -1820,12 +1798,10 @@ sub find_extra_svn_parents {
                       );
 
                if ($ninc) {
-                       warn "W:svn cherry-pick ignored ($spec) - missing " .
+                       warn "W: svn cherry-pick ignored ($spec) - missing " .
                                "$ninc commit(s) (eg $ifirst)\n";
                } else {
-                       warn
-                               "Found merge parent ($spec): ",
-                                       $merge_tip, "\n";
+                       warn "Found merge parent ($spec): ", $merge_tip, "\n";
                        push @new_parents, $merge_tip;
                }
        }
@@ -1857,16 +1833,14 @@ sub make_log_entry {
        my @parents = @$parents;
        my $props = $ed->{dir_prop}{$self->path};
        if ( $props->{"svk:merge"} ) {
-               $self->find_extra_svk_parents
-                       ($ed, $props->{"svk:merge"}, \@parents);
+               $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
        }
        if ( $props->{"svn:mergeinfo"} ) {
                my $mi_changes = $self->mergeinfo_changes
                        ($parent_path, $parent_rev,
                         $self->path, $rev,
                         $props->{"svn:mergeinfo"});
-               $self->find_extra_svn_parents
-                       ($ed, $mi_changes, \@parents);
+               $self->find_extra_svn_parents($mi_changes, \@parents);
        }
 
        open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;
@@ -2391,7 +2365,7 @@ sub _new {
 
        # Older repos imported by us used $GIT_DIR/svn/foo instead of
        # $GIT_DIR/svn/refs/remotes/foo when tracking refs/remotes/foo
-       if ($ref_id =~ m{^refs/remotes/(.*)}) {
+       if ($ref_id =~ m{^refs/remotes/(.+)}) {
                my $old_dir = "$ENV{GIT_DIR}/svn/$1";
                if (-d $old_dir && ! -d $dir) {
                        $dir = $old_dir;