{"thread":{"id":"37840","subject":"[PATCH] git-svn: (cleanup) remove editor param passing","startedAt":"2014-10-30T08:36:45Z","lastAt":"2014-10-30T08:36:45Z","messageCount":1,"participants":["Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"251208","messageId":"1414658206-12629-1-git-send-email-normalperson@yhbt.net","threadId":"37840","inReplyTo":null,"subject":"[PATCH] git-svn: (cleanup) remove editor param passing","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2014-10-30T08:36:45Z","receivedAt":"2014-10-30T08:36:45Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Neither find_extra_svk_parents or find_extra_svn_parents ever\nused the `$ed' parameter.\n\nSigned-off-by: Eric Wong <normalperson@yhbt.net>\n---\n perl/Git/SVN.pm | 10 ++++------\n 1 file changed, 4 insertions(+), 6 deletions(-)\n\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 5f9d469..893b9a8 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1433,7 +1433,7 @@ sub check_author {\n }\n \n sub find_extra_svk_parents {\n-\tmy ($self, $ed, $tickets, $parents) = @_;\n+\tmy ($self, $tickets, $parents) = @_;\n \t# aha!  svk:merge property changed...\n \tmy @tickets = split \"\\n\", $tickets;\n \tmy @known_parents;\n@@ -1736,7 +1736,7 @@ sub mergeinfo_changes {\n # note: this function should only be called if the various dirprops\n # have actually changed\n sub find_extra_svn_parents {\n-\tmy ($self, $ed, $mergeinfo, $parents) = @_;\n+\tmy ($self, $mergeinfo, $parents) = @_;\n \t# aha!  svk:merge property changed...\n \n \tmemoize_svn_mergeinfo_functions();\n@@ -1835,16 +1835,14 @@ sub make_log_entry {\n \tmy @parents = @$parents;\n \tmy $props = $ed->{dir_prop}{$self->path};\n \tif ( $props->{\"svk:merge\"} ) {\n-\t\t$self->find_extra_svk_parents\n-\t\t\t($ed, $props->{\"svk:merge\"}, \\@parents);\n+\t\t$self->find_extra_svk_parents($props->{\"svk:merge\"}, \\@parents);\n \t}\n \tif ( $props->{\"svn:mergeinfo\"} ) {\n \t\tmy $mi_changes = $self->mergeinfo_changes\n \t\t\t($parent_path, $parent_rev,\n \t\t\t $self->path, $rev,\n \t\t\t $props->{\"svn:mergeinfo\"});\n-\t\t$self->find_extra_svn_parents\n-\t\t\t($ed, $mi_changes, \\@parents);\n+\t\t$self->find_extra_svn_parents($mi_changes, \\@parents);\n \t}\n \n \topen my $un, '>>', \"$self->{dir}/unhandled.log\" or croak $!;\n-- \nEW\n"}]}