git-svn: fix cloning of HTTP URLs with '+' in their path

With this, git svn clone -s http://svn.gnome.org/svn/gtk+
is successful.

Also modified the funky rename test for this, which _does_
include escaped '+' signs for HTTP URLs.  SVN seems to accept
either "+" or "%2B" in filenames and directories (just not the
main URL), so I'll leave it alone for now.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-svn.perl b/git-svn.perl
index e47b1ea6c1c19d3b5b9bf26ecbf6b0a0f32d08d6..413e0b1db6a45bbb5d3635f6af64d865580a13ab 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -3673,7 +3673,7 @@ sub escape_uri_only {
        my ($uri) = @_;
        my @tmp;
        foreach (split m{/}, $uri) {
        my ($uri) = @_;
        my @tmp;
        foreach (split m{/}, $uri) {

-               s/([^\w.%-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
+               s/([^\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;

                push @tmp, $_;
        }
        join('/', @tmp);
                push @tmp, $_;
        }
        join('/', @tmp);

diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh
index 9decd2e1e81cfcba9c2b407abb176eea73d37ed9..d8f33557911389ab0e179b70e27d85264ef5ca0a 100644 (file)
--- a/t/lib-git-svn.sh
+++ b/t/lib-git-svn.sh
@@ -73,11 +73,16 @@ for d in \
 done
 
 start_httpd () {
 done
 
 start_httpd () {

+       repo_base_path="$1"

        if test -z "$SVN_HTTPD_PORT"
        then
                echo >&2 'SVN_HTTPD_PORT is not defined!'
                return
        fi
        if test -z "$SVN_HTTPD_PORT"
        then
                echo >&2 'SVN_HTTPD_PORT is not defined!'
                return
        fi

+       if test -z "$repo_base_path"
+       then
+               repo_base_path=svn
+       fi

 
        mkdir "$GIT_DIR"/logs
 
 
        mkdir "$GIT_DIR"/logs
 


@@ -90,13 +95,13 @@ LockFile logs/accept.lock
 Listen 127.0.0.1:$SVN_HTTPD_PORT
 LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
 LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so
 Listen 127.0.0.1:$SVN_HTTPD_PORT
 LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so
 LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so

-<Location /svn>
+<Location /$repo_base_path>

        DAV svn
        SVNPath $rawsvnrepo
 </Location>
 EOF
        "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start
        DAV svn
        SVNPath $rawsvnrepo
 </Location>
 EOF
        "$SVN_HTTPD_PATH" -f "$GIT_DIR"/httpd.conf -k start

-       svnrepo=http://127.0.0.1:$SVN_HTTPD_PORT/svn
+       svnrepo="http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path"

 }
 
 stop_httpd () {
 }
 
 stop_httpd () {

diff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh
index 182299cbb53a8bae9e3cd51f9aff9073e08559c1..4acbcb0acdce7852ee1f416250b5939132a93ca1 100755 (executable)
--- a/t/t9115-git-svn-dcommit-funky-renames.sh
+++ b/t/t9115-git-svn-dcommit-funky-renames.sh
@@ -9,7 +9,7 @@ test_description='git-svn dcommit can commit renames of files with ugly names'
 
 test_expect_success 'load repository with strange names' "
        svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&
 
 test_expect_success 'load repository with strange names' "
        svnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&

-       start_httpd
+       start_httpd gtk+

        "
 
 test_expect_success 'init and fetch repository' "
        "
 
 test_expect_success 'init and fetch repository' "


@@ -49,6 +49,39 @@ test_expect_success 'rename pretty file into ugly one' '
        git svn dcommit
        '
 
        git svn dcommit
        '
 

+test_expect_success 'add a file with plus signs' '
+       echo .. > +_+ &&
+       git update-index --add +_+ &&
+       git commit -m plus &&
+       mkdir gtk+ &&
+       git mv +_+ gtk+/_+_ &&
+       git commit -m plus_dir &&
+       git svn dcommit
+       '
+
+test_expect_success 'clone the repository to test rebase' "
+       git svn clone $svnrepo test-rebase &&
+       cd test-rebase &&
+               echo test-rebase > test-rebase &&
+               git add test-rebase &&
+               git commit -m test-rebase &&
+               cd ..
+       "
+
+test_expect_success 'make a commit to test rebase' "
+               echo test-rebase-main > test-rebase-main &&
+               git add test-rebase-main &&
+               git commit -m test-rebase-main &&
+               git svn dcommit
+       "
+
+test_expect_success 'git-svn rebase works inside a fresh-cloned repository' "
+       cd test-rebase &&
+               git svn rebase &&
+               test -e test-rebase-main &&
+               test -e test-rebase
+       "
+

 stop_httpd
 
 test_done
 stop_httpd
 
 test_done