mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: (cleanup) remove editor param passing

Browse Source 
Neither find_extra_svk_parents or find_extra_svn_parents ever
used the `$ed' parameter.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
This commit is contained in:
Eric Wong
2014-10-29 20:10:29 +00:00
parent 835e3ddeff
commit 4ae9a7b966
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
perl/Git/SVN.pm
View File

@ -1433,7 +1433,7 @@ sub check_author {
} }
sub find_extra_svk_parents { sub find_extra_svk_parents {
my ($self, $ed, $tickets, $parents) = @_; my ($self, $tickets, $parents) = @_;
# aha! svk:merge property changed... # aha! svk:merge property changed...
my @tickets = split "\n", $tickets; my @tickets = split "\n", $tickets;
my @known_parents; my @known_parents;
@ -1736,7 +1736,7 @@ sub mergeinfo_changes {
# note: this function should only be called if the various dirprops # note: this function should only be called if the various dirprops
# have actually changed # have actually changed
sub find_extra_svn_parents { sub find_extra_svn_parents {
my ($self, $ed, $mergeinfo, $parents) = @_; my ($self, $mergeinfo, $parents) = @_;
# aha! svk:merge property changed... # aha! svk:merge property changed...
memoize_svn_mergeinfo_functions(); memoize_svn_mergeinfo_functions();
@ -1835,16 +1835,14 @@ sub make_log_entry {
my @parents = @$parents; my @parents = @$parents;
my $props = $ed->{dir_prop}{$self->path}; my $props = $ed->{dir_prop}{$self->path};
if ( $props->{"svk:merge"} ) { if ( $props->{"svk:merge"} ) {
$self->find_extra_svk_parents $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
($ed, $props->{"svk:merge"}, \@parents);
} }
if ( $props->{"svn:mergeinfo"} ) { if ( $props->{"svn:mergeinfo"} ) {
my $mi_changes = $self->mergeinfo_changes my $mi_changes = $self->mergeinfo_changes
($parent_path, $parent_rev, ($parent_path, $parent_rev,
$self->path, $rev, $self->path, $rev,
$props->{"svn:mergeinfo"}); $props->{"svn:mergeinfo"});
$self->find_extra_svn_parents $self->find_extra_svn_parents($mi_changes, \@parents);
($ed, $mi_changes, \@parents);
} }
open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!; open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;