Merge branch 'sv/doc-stripspace'

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 4364506ca254fab75dcf949e6105b40a0585e4ef..d9a52a52df338926cdc21ea925cebc2dd7c3a388 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 {
@@ -1746,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();
@@ -1808,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;
                }
        }
@@ -1845,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 $!;