Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
git-svn: (cleanup) remove editor param passing
author
Eric Wong
<normalperson@yhbt.net>
Wed, 29 Oct 2014 20:10:29 +0000
(20:10 +0000)
committer
Eric Wong
<normalperson@yhbt.net>
Thu, 30 Oct 2014 08:29:43 +0000
(08:29 +0000)
Neither find_extra_svk_parents or find_extra_svn_parents ever
used the `$ed' parameter.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
perl/Git/SVN.pm
patch
|
blob
|
history
raw
|
patch
|
inline
| side by side (parent:
835e3dd
)
diff --git
a/perl/Git/SVN.pm
b/perl/Git/SVN.pm
index 5f9d4690bb53463534a7b9c5e3695a26fdb8981a..893b9a8bb50a7830f725971191768fc424476560 100644
(file)
--- a/
perl/Git/SVN.pm
+++ b/
perl/Git/SVN.pm
@@
-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...
my @tickets = split "\n", $tickets;
my @known_parents;
# aha! svk:merge property changed...
my @tickets = split "\n", $tickets;
my @known_parents;
@@
-1736,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 {
# 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();
# aha! svk:merge property changed...
memoize_svn_mergeinfo_functions();
@@
-1835,16
+1835,14
@@
sub make_log_entry {
my @parents = @$parents;
my $props = $ed->{dir_prop}{$self->path};
if ( $props->{"svk:merge"} ) {
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"});
}
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 $!;
}
open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;