[PATCH 2/2] git-svn: apply "svn.pathnameencoding" before URL encoding
- From
Kazutoshi Satoda <k_satoda@f2.dion.ne.jp>
- Date
- Feb 8, 2016, 15:21 UTC
- Message-ID
- <56B8B25E.9000001@f2.dion.ne.jp>
- In-Reply-To
- <56B8B1EA.5020901@f2.dion.ne.jp>
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.
Signed-off-by: Kazutoshi SATODA <k_satoda@f2.dion.ne.jp> --- perl/Git/SVN/Editor.pm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm index d9d9bdf..4c4199a 100644 --- 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 {
-- 2.7.0