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

git-svn: skip mergeinfo handling with --no-follow-parent

Browse Source 
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>
This commit is contained in:
Eric Wong
2016-06-20 21:52:53 +00:00
parent ab7797dbe9
commit 6d523a3ab7
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
perl/Git/SVN.pm
View File

@@ -1905,16 +1905,23 @@ 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 ($self->follow_parent) {
$self->find_extra_svk_parents($props->{"svk:merge"}, \@parents); my $tickets = $props->{"svk:merge"};
if ($tickets) {
$self->find_extra_svk_parents($tickets, \@parents);
} }
if ( $props->{"svn:mergeinfo"} ) {
my $mi_changes = $self->mergeinfo_changes my $mergeinfo_prop = $props->{"svn:mergeinfo"};
($parent_path, $parent_rev, if ($mergeinfo_prop) {
$self->path, $rev, my $mi_changes = $self->mergeinfo_changes(
$props->{"svn:mergeinfo"}); $parent_path,
$parent_rev,
$self->path,
$rev,
$mergeinfo_prop);
$self->find_extra_svn_parents($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 $!;
print $un "r$rev\n" or croak $!; print $un "r$rev\n" or croak $!;