@matheusbsbs / matheus-bagliano / commits / 5268f9edc3
Fork 0

svn: assume URLs from the command-line are URI-encoded

And then unescape them when writing to $GIT_CONFIG. SVN has different rules for repository URLs (usually the root) and for paths within that repository (below the HTTP layer). Thus, for the request URI path at the HTTP level, the URI needs to be encoded. However, in the body of the HTTP request (the with underlying SVN XML protocol), those paths should not be URI-encoded[1]. For non-HTTP(S) requests, SVN appears to be more flexible and will except weird characters in the URL as well as URI-encoded ones. Since users are used to using URLs being entirely URI-encoded, git svn will now attempt to unescape the path portion of URLs while leaving the actual repository URL untouched. This change will be reflected in newly-created $GIT_CONFIG files only. This allows users to switch between svn(+ssh)://, file:// and http(s):// urls without changing the fetch/branches/tags config keys. This won't affect existing imports at all (since things didn't work before this commit anyways), and will allow users to force escaping into repository paths that look like they're escaped (but are not). Thanks to Mike Smullin for the original bug report and Björn Steinbrink for summarizing it into testable cases for me. [1] Except when committing copies/renames, see commit 29633bb91c7bcff31ff3bb59378709e3e3ef627d Signed-off-by: Eric Wong <normalperson@yhbt.net>

Eric Wong committed Aug 16, 2009 at 14:22 UTC 5268f9edc3c86b07a64fcc2679e5ffe39be28d97
2 files changed +54
git-svn.perl
+2
@@ -1222,6 +1222,7 @@ sub complete_url_ls_init {
1222 }
1223 command_oneline('config', $k, $gs->{url}) unless $orig_url;
1224 my $remote_path = "$gs->{path}/$repo_path";
1225 + $remote_path =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1226 $remote_path =~ s#/+#/#g;
1227 $remote_path =~ s#^/##g;
1228 $remote_path .= "/*" if $remote_path !~ /\*/;
@@ -1892,6 +1893,7 @@ sub init_remote_config {
1893 command_noisy('config',
1894 "svn-remote.$self->{repo_id}.url", $url);
1895 $self->{path} =~ s{^/}{};
1896 + $self->{path} =~ s{%([0-9A-F]{2})}{chr hex($1)}ieg;
1897 command_noisy('config', '--add',
1898 "svn-remote.$self->{repo_id}.fetch",
1899 "$self->{path}:".$self->refname);
t/t9120-git-svn-clone-with-percent-escapes.sh
+52
@@ -10,6 +10,10 @@ test_expect_success 'setup svnrepo' '
10 mkdir project project/trunk project/branches project/tags &&
11 echo foo > project/trunk/foo &&
12 svn_cmd import -m "$test_description" project "$svnrepo/pr ject" &&
13 + svn_cmd cp -m "branch" "$svnrepo/pr ject/trunk" \
14 + "$svnrepo/pr ject/branches/b" &&
15 + svn_cmd cp -m "tag" "$svnrepo/pr ject/trunk" \
16 + "$svnrepo/pr ject/tags/v1" &&
17 rm -rf project &&
18 start_httpd
19 '
@@ -21,6 +25,54 @@ test_expect_success 'test clone with percent escapes' '
25 cd ..
26 '
27
28 +# SVN works either way, so should we...
29 +
30 +test_expect_success 'svn checkout with percent escapes' '
31 + svn_cmd checkout "$svnrepo/pr%20ject" svn.percent &&
32 + svn_cmd checkout "$svnrepo/pr%20ject/trunk" svn.percent.trunk
33 +'
34 +
35 +test_expect_success 'svn checkout with space' '
36 + svn_cmd checkout "$svnrepo/pr ject" svn.space &&
37 + svn_cmd checkout "$svnrepo/pr ject/trunk" svn.space.trunk
38 +'
39 +
40 +test_expect_success 'test clone trunk with percent escapes and minimize-url' '
41 + git svn clone --minimize-url "$svnrepo/pr%20ject/trunk" minimize &&
42 + (
43 + cd minimize &&
44 + git rev-parse refs/${remotes_git_svn}
45 + )
46 +'
47 +
48 +test_expect_success 'test clone trunk with percent escapes' '
49 + git svn clone "$svnrepo/pr%20ject/trunk" trunk &&
50 + (
51 + cd trunk &&
52 + git rev-parse refs/${remotes_git_svn}
53 + )
54 +'
55 +
56 +test_expect_success 'test clone --stdlayout with percent escapes' '
57 + git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
58 + (
59 + cd percent &&
60 + git rev-parse refs/remotes/trunk^0 &&
61 + git rev-parse refs/remotes/b^0 &&
62 + git rev-parse refs/remotes/tags/v1^0
63 + )
64 +'
65 +
66 +test_expect_success 'test clone -s with unescaped space' '
67 + git svn clone -s "$svnrepo/pr ject" space &&
68 + (
69 + cd space &&
70 + git rev-parse refs/remotes/trunk^0 &&
71 + git rev-parse refs/remotes/b^0 &&
72 + git rev-parse refs/remotes/tags/v1^0
73 + )
74 +'
75 +
76 stop_httpd
77
78 test_done