git-svn: skip mergeinfo handling with --no-follow-parent
For repositories without parent following enabled, finding git parents through svn:mergeinfo or svk::parents can be expensive and pointless. Reported-by: Александр Овчинников <proff@proff.email> http://mid.gmane.org/4094761466408188@web24o.yandex.ru Signed-off-by: Eric Wong <e@80x24.org>
Eric Wong committed
Jun 20, 2016 at 21:52 UTC
6d523a3ab76cfa4ed9ae0ed9da7af43efcff3f07
1 file changed
+16
-9
perl/Git/SVN.pm
+16
-9
@@ -1905,15 +1905,22 @@ sub make_log_entry {
1905
1906
my @parents = @$parents;
1907
my $props = $ed->{dir_prop}{$self->path};
1908
- if ( $props->{"svk:merge"} ) {
1909
- $self->find_extra_svk_parents($props->{"svk:merge"}, \@parents);
1910
- }
1911
- if ( $props->{"svn:mergeinfo"} ) {
1912
- my $mi_changes = $self->mergeinfo_changes
1913
- ($parent_path, $parent_rev,
1914
- $self->path, $rev,
1915
- $props->{"svn:mergeinfo"});
1916
- $self->find_extra_svn_parents($mi_changes, \@parents);
1908
+ if ($self->follow_parent) {
1909
+ my $tickets = $props->{"svk:merge"};
1910
+ if ($tickets) {
1911
+ $self->find_extra_svk_parents($tickets, \@parents);
1912
+ }
1913
+
1914
+ my $mergeinfo_prop = $props->{"svn:mergeinfo"};
1915
+ if ($mergeinfo_prop) {
1916
+ my $mi_changes = $self->mergeinfo_changes(
1917
+ $parent_path,
1918
+ $parent_rev,
1919
+ $self->path,
1920
+ $rev,
1921
+ $mergeinfo_prop);
1922
+ $self->find_extra_svn_parents($mi_changes, \@parents);
1923
+ }
1924
}
1925
1926
open my $un, '>>', "$self->{dir}/unhandled.log" or croak $!;