A bug with "git svn show-externals"

Tao Peng· Oct 25, 2016, 23:53 UTC · lore

Hi there,

I met a bug of the "git svn show-externals” command.  If a subdirectory item has a svn:externals property, and the format of the property is “URL first, then the local path”, running "git svn show-externals” command at the root level will result in an unusable output.

Example: $ svn pg svn:externals svn+ssh://src.foo.com/svn/ref/English.lproj/ svn+ssh://src.foo.com/svn/orig/trunk/Resources/English.lproj/Localizable.strings Localizable.strings

$ git svn show-externals # /English.lproj/ /English.lproj/svn+ssh://src.foo.com/svn/orig/trunk/Resources/English.lproj/Localizable.strings Localizable.strings

This bug is preventing my script from correctly finishing the svn-to-git repo migration work. Does anyone know a workaround to this bug?

Thanks, Peng

Eric Wong· Oct 26, 2016, 19:10 UTC · re: Tao Peng · lore

Re: A bug with "git svn show-externals"

Tao Peng <pengtao@me.com> wrote:

Show 7 quoted lines

> Hi there,
> 
> I met a bug of the "git svn show-externals” command.  If a subdirectory item has a svn:externals property, and the format of the property is “URL first, then the local path”, running "git svn show-externals” command at the root level will result in an unusable output.
> 
> Example:
> $ svn pg svn:externals svn+ssh://src.foo.com/svn/ref/English.lproj/
> svn+ssh://src.foo.com/svn/orig/trunk/Resources/English.lproj/Localizable.strings Localizable.strings

+Cc Vineet who originally implemented this 9 years ago

I've never used externals much, but I guess it's common for externals to be a full URL and not merely a relative path to somewhere within the same SVN repo.

> $ git svn show-externals
> # /English.lproj/
> /English.lproj/svn+ssh://src.foo.com/svn/orig/trunk/Resources/English.lproj/Localizable.strings Localizable.strings

> 
> This bug is preventing my script from correctly finishing the svn-to-git repo migration work. Does anyone know a workaround to this bug?

Can you try the following change to ignore path prefixing for full URLs?

diff --git a/git-svn.perl b/git-svn.perl
index 4d41d22..ced665a 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -1303,7 +1303,9 @@ sub cmd_show_externals {
 		my $s = $props->{'svn:externals'} or return;
 		$s =~ s/[\r\n]+/\n/g;
 		chomp $s;
-		$s =~ s#^#$path#gm;
+		if ($s !~ m#^[a-z\+]+://#i) {
+			$s =~ s#^#$path#gm;
+		}
 		print STDOUT "$s\n";
 	});
 }