Skip to contentSkip to conversation

git-svn: fix occasional "Failed to strip path" error on fetch next commit

PATCH In review Ilya Basin 2 participants 2 messages Jun 15, 2016

lore
Share & tools
lore

Ilya Basin

author
#0 lore raw

PATCH 1/2 git-svn: fix occasional "Failed to strip path" error on fetch next commit

When --stdlayout and --preserve-empty-dirs flags are used and a directory becomes empty, sometimes no empty dir placeholder file created. Then on fetch next commit git-svn dies with "Failed to strip path" error.

Test script:

rm -rf testrepo.svn testrepo.gitsvn
svnadmin create testrepo.svn
url=file://pwd/testrepo.svn

svn mkdir -m "" "$url/trunk" "$url/branches" "$url/tags" rm -rf testrepo
svn co "$url" testrepo
cd testrepo/trunk

mkdir -p foo/bar/
svn add foo/
svn commit -mx

svn rm foo/bar/
svn commit -mx

svn up
mkdir -p baz/
svn add baz/
svn commit -mx

echo x > fil.txt
svn add fil.txt
svn commit -mx

cd ../..

git svn clone --stdlayout --preserve-empty-dirs "$url" testrepo.gitsvn

---
 perl/Git/SVN/Fetcher.pm | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)
perl/Git/SVN/Fetcher.pm +8 -4
index 046a7a2..4f96076 100644
@@ -129,6 +129,7 @@ sub is_path_ignored {
 
 sub set_path_strip {
 	my ($self, $path) = @_;
+	$self->{pathprefix_strip} = length $path ? ($path . "/") : "";
 	$self->{path_strip} = qr/^\Q$path\E(\/|$)/ if length $path;
 }
 

@@ -458,9 +459,12 @@ sub find_empty_directories {
 		my $skip_added = 0;
 		foreach my $t (qw/dir_prop file_prop/) {
 			foreach my $path (keys %{ $self->{$t} }) {
-				if (exists $self->{$t}->{dirname($path)}) {
-					$skip_added = 1;
-					last;
+				if (length $self->git_path($path)) {
+					$path = dirname($path);
+					if ($dir eq $self->git_path($path) && exists $self->{$t}->{$path}) {
+						$skip_added = 1;
+						last;
+					}
 				}
 			}
 			last if $skip_added;

@@ -477,7 +481,7 @@ sub find_empty_directories {
 		delete $files{$_} foreach (@deleted_gpath);
 
 		# Report the directory if there are no filenames left.
-		push @empty_dirs, $dir unless (scalar %files);
+		push @empty_dirs, ($self->{pathprefix_strip} . $dir) unless (scalar %files);
 	}
 	@empty_dirs;
 }
Signature · 1 line
1.8.1.5
#1 lore raw
Quoted 1 line · Ilya Basin

You should Cc Eric on git-svn related patches.

Quoted 23 lines

Test script:

rm -rf testrepo.svn testrepo.gitsvn
svnadmin create testrepo.svn
url=file://pwd/testrepo.svn

svn mkdir -m "" "$url/trunk" "$url/branches" "$url/tags" rm -rf testrepo
svn co "$url" testrepo
cd testrepo/trunk

mkdir -p foo/bar/
svn add foo/
svn commit -mx

svn rm foo/bar/
svn commit -mx

svn up
mkdir -p baz/
svn add baz/
svn commit -mx

Quoted 7 lines

echo x > fil.txt
svn add fil.txt
svn commit -mx

cd ../..

git svn clone --stdlayout --preserve-empty-dirs "$url" testrepo.gitsvn

Please add an actual regression test, probably to t9160.

Signature · 2 lines
Thomas Rast
trast@{inf,student}.ethz.ch