git-svn: apply "svn.pathnameencoding" before URL encoding

k-satoda · Eric Wong · commit 1b42f45255de · 2016-02-22T02:29:36.000Z
The conversion from "svn.pathnameencoding" to UTF-8 should be applied
first, and then URL encoding should be applied on the resulting UTF-8
path. The reversed order of these transforms (used before this fix)
makes non-UTF-8 URL which causes error from Subversion such as
"Filesystem has no item: '...' path not found" when sending a rename (or
a copy) from non-ASCII path.

[ew: t9115 test case added (requires SVN_HTTPD_PORT set to test),
 squash LC_ALL=$a_utf8_locale export from Kazutoshi for Cygwin]

Signed-off-by: Kazutoshi SATODA &lt;k_satoda@f2.dion.ne.jp&gt;
Signed-off-by: Eric Wong &lt;normalperson@yhbt.net&gt;
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm
@@ -144,11 +144,12 @@ sub repo_path {
 
 sub url_path {
 	my ($self, $path) = @_;
+	$path = $self->repo_path($path);
 	if ($self->{url} =~ m#^https?://#) {
 		# characters are taken from subversion/libsvn_subr/path.c
 		$path =~ s#([^~a-zA-Z0-9_./!$&'()*+,-])#sprintf("%%%02X",ord($1))#eg;
 	}
-	$self->{url} . '/' . $self->repo_path($path);
+	$self->{url} . '/' . $path;
 }
 
 sub rmdirs {
diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -104,6 +104,21 @@ test_expect_success UTF8 'svn.pathnameencoding=cp932 new file on dcommit' '
 	git svn dcommit
 '
 
+# See the comment on the above test for setting of LC_ALL.
+test_expect_success 'svn.pathnameencoding=cp932 rename on dcommit' '
+	LC_ALL=$a_utf8_locale &&
+	export LC_ALL &&
+	inf=$(printf "\201\207") &&
+	git config svn.pathnameencoding cp932 &&
+	echo inf >"$inf" &&
+	git add "$inf" &&
+	git commit -m "inf" &&
+	git svn dcommit &&
+	git mv "$inf" inf &&
+	git commit -m "inf rename" &&
+	git svn dcommit
+'
+
 stop_httpd
 
 test_done

Original file line number	Diff line number	Diff line change
`@@ -144,11 +144,12 @@ sub repo_path {`
`144`	`144`
`145`	`145`	`sub url_path {`
`146`	`146`	`my ($self, $path) = @_;`
	`147`	`+ $path = $self->repo_path($path);`
`147`	`148`	`if ($self->{url} =~ m#^https?://#) {`
`148`	`149`	`# characters are taken from subversion/libsvn_subr/path.c`
`149`	`150`	`$path =~ s#([^~a-zA-Z0-9_./!$&'()*+,-])#sprintf("%%%02X",ord($1))#eg;`
`150`	`151`	`}`
`151`		`- $self->{url} . '/' . $self->repo_path($path);`
	`152`	`+ $self->{url} . '/' . $path;`
`152`	`153`	`}`
`153`	`154`
`154`	`155`	`sub rmdirs {`