diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-22 10:29:46 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-22 10:29:46 -0800 |
| commit | d4bd6781de521904cdd4383c5f2eb338d1ecb81b (patch) | |
| tree | ba074f08836341614c7c0344a4bfe2af7bc23549 /perl | |
| parent | Merge branch 'pw/completion-stash' (diff) | |
| parent | git-svn: apply "svn.pathnameencoding" before URL encoding (diff) | |
| download | tgif-d4bd6781de521904cdd4383c5f2eb338d1ecb81b.tar.xz | |
Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn
* 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn:
git-svn: apply "svn.pathnameencoding" before URL encoding
git-svn: enable "svn.pathnameencoding" on dcommit
git-svn: hoist out utf8 prep from t9129 to lib-git-svn
Diffstat (limited to 'perl')
| -rw-r--r-- | perl/Git/SVN/Editor.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/perl/Git/SVN/Editor.pm b/perl/Git/SVN/Editor.pm index c50176eec9..4c4199afec 100644 --- a/perl/Git/SVN/Editor.pm +++ b/perl/Git/SVN/Editor.pm @@ -41,6 +41,7 @@ sub new { "$self->{svn_path}/" : ''; $self->{config} = $opts->{config}; $self->{mergeinfo} = $opts->{mergeinfo}; + $self->{pathnameencoding} = Git::config('svn.pathnameencoding'); return $self; } @@ -143,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 { |