{"thread":{"id":"12952","subject":"git-svn: regression with funny chars in svn repo url","startedAt":"2008-04-01T18:11:46Z","lastAt":"2008-05-11T00:14:49Z","messageCount":5,"participants":["Panagiotis Vossos","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"73510","messageId":"d06901f0804011111o1da8a197ob6a9aaccb3e1e9a0@mail.gmail.com","threadId":"12952","inReplyTo":null,"subject":"git-svn: regression with funny chars in svn repo url","fromName":"Panagiotis Vossos","fromEmail":"pavossos@gmail.com","sentAt":"2008-04-01T18:11:46Z","receivedAt":"2008-04-01T18:11:46Z","isPatch":false,"sender":{"key":"pavossos@gmail.com","avatar":null},"body":"I keep a copy of the gtk+ svn repository on my machine and I have\nnoticed the following bug with git-svn:\n\n~/gitproj/gtk+$ which git-svn\n/usr/local/bin/git-svn\n\n~/gitproj/gtk+$ ls -l /usr/local/bin/git-svn\nlrwxrwxrwx 1 root staff 39 2008-03-30 07:45 /usr/local/bin/git-svn ->\n../encap/git-1.5.4_20080328/bin/git-svn\n\n~/gitproj/gtk+$ git-svn --version\ngit-svn version 1.5.4.5 (svn 1.4.6)\n\n~/gitproj/gtk+$ git-svn rebase\nApache got a malformed URI: REPORT request failed on\n'/svn/gtk+/!svn/vcc/default': Unusable URI: it does not refer to this\nrepository at /usr/local/bin/git-svn line 3821\n\n\nThis bug did not exist in a previous version:\n\nvozzer@kermit:~/gitproj/gtk+$ ls -l\n/usr/local/encap/git-1.5.3_20071207/bin/git-svn\n-rwxr-xr-x 1 root staff 119648 2007-12-08 10:53\n/usr/local/encap/git-1.5.3_20071207/bin/git-svn\nvozzer@kermit:~/gitproj/gtk+$\n/usr/local/encap/git-1.5.3_20071207/bin/git-svn --version\ngit-svn version 1.5.3.7.8.g8e742 (svn 1.4.6)\nvozzer@kermit:~/gitproj/gtk+$\n/usr/local/encap/git-1.5.3_20071207/bin/git-svn rebase\n\n\n M gtk/gtk-builder-convert\n M ChangeLog\nr19608 = af3d481e25db0e168a33b94e14480d72af5effe4 (gtk-2-12)\n[snipped]\n\n, proceeds normally. I have included the output of `git-svn\n--version' above for both versions,\nbut also take note of the encap directories for approximate dates: the\nworking version was\nbuilt from a fresh checkout on 2007-12-07, the non-working version was\nbuilt from\nyesterdays checkout.\n\nFor reference, the url for the gtk+ svn repo is:\n\nhttp://svn.gnome.org/svn/gtk+/trunk\n\nI initialized the git-svn repo with the usual '-T trunk -t tags -b\nbranches' args.\n\nregards,\npanagiotis.\n\nps. please cc me when replying, I have not subscribed to the list.\n"},{"id":"73810","messageId":"20080407081108.GA28853@soma","threadId":"12952","inReplyTo":"d06901f0804011111o1da8a197ob6a9aaccb3e1e9a0@mail.gmail.com","subject":"Re: git-svn: regression with funny chars in svn repo url","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2008-04-07T08:11:08Z","receivedAt":"2008-04-07T08:11:08Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Panagiotis Vossos wrote:\n> I keep a copy of the gtk+ svn repository on my machine and I have\n> noticed the following bug with git-svn:\n> \n> ~/gitproj/gtk+$ which git-svn\n> /usr/local/bin/git-svn\n> \n> ~/gitproj/gtk+$ ls -l /usr/local/bin/git-svn\n> lrwxrwxrwx 1 root staff 39 2008-03-30 07:45 /usr/local/bin/git-svn ->\n> ../encap/git-1.5.4_20080328/bin/git-svn\n> \n> ~/gitproj/gtk+$ git-svn --version\n> git-svn version 1.5.4.5 (svn 1.4.6)\n> \n> ~/gitproj/gtk+$ git-svn rebase\n> Apache got a malformed URI: REPORT request failed on\n> '/svn/gtk+/!svn/vcc/default': Unusable URI: it does not refer to this\n> repository at /usr/local/bin/git-svn line 3821\n\nI've known of this bug for a while but didn't track it down until\nnow. Please let me know if this fixes things for you and if\nthere are any regressions; thanks.\n\n>From a9ebe54adf7ae2620fba1f638dee9566f8ccca82 Mon Sep 17 00:00:00 2001\nFrom: Eric Wong \nDate: Mon, 7 Apr 2008 00:41:44 -0700\nSubject: [PATCH] git-svn: fix cloning of HTTP URLs with '+' in their path\n\nWith this, git svn clone -s http://svn.gnome.org/svn/gtk+\nis successful.\n\nAlso modified the funky rename test for this, which _does_\ninclude escaped '+' signs for HTTP URLs. SVN seems to accept\neither \"+\" or \"%2B\" in filenames and directories (just not the\nmain URL), so I'll leave it alone for now.\n\nSigned-off-by: Eric Wong \n---\n git-svn.perl | 2 +-\n t/t9115-git-svn-dcommit-funky-renames.sh | 10 ++++++++++\n 2 files changed, 11 insertions(+), 1 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex 81afb5c..d91ef7a 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3666,7 +3666,7 @@ sub escape_uri_only {\n \tmy ($uri) = @_;\n \tmy @tmp;\n \tforeach (split m{/}, $uri) {\n-\t\ts/([^\\w.%-]|%(?![a-fA-F0-9]{2}))/sprintf(\"%%%02X\",ord($1))/eg;\n+\t\ts/([^\\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf(\"%%%02X\",ord($1))/eg;\n \t\tpush @tmp, $_;\n \t}\n \tjoin('/', @tmp);\ndiff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh\nindex 182299c..835b1dc 100755\n--- a/t/t9115-git-svn-dcommit-funky-renames.sh\n+++ b/t/t9115-git-svn-dcommit-funky-renames.sh\n@@ -49,6 +49,16 @@ test_expect_success 'rename pretty file into ugly one' '\n \tgit svn dcommit\n \t'\n \n+test_expect_success 'add a file with plus signs' '\n+\techo .. > +_+ &&\n+\tgit update-index --add +_+ &&\n+\tgit commit -m plus &&\n+\tmkdir gtk+ &&\n+\tgit mv +_+ gtk+/_+_ &&\n+\tgit commit -m plus_dir &&\n+\tgit svn dcommit\n+\t'\n+\n stop_httpd\n \n test_done\n-- \nEric Wong\n"},{"id":"73883","messageId":"d06901f0804081454r76a373e6h745f99a9dcbd6bc5@mail.gmail.com","threadId":"12952","inReplyTo":"20080407081108.GA28853@soma","subject":"Re: git-svn: regression with funny chars in svn repo url","fromName":"Panagiotis Vossos","fromEmail":"pavossos@gmail.com","sentAt":"2008-04-08T21:54:42Z","receivedAt":"2008-04-08T21:54:42Z","isPatch":false,"sender":{"key":"pavossos@gmail.com","avatar":null},"body":"On Mon, Apr 7, 2008 at 11:11 AM, Eric Wong wrote:\n\n> Panagiotis Vossos wrote:\n> > I keep a copy of the gtk+ svn repository on my machine and I have\n> > noticed the following bug with git-svn:\n> >\n> > ~/gitproj/gtk+$ git-svn --version\n> > git-svn version 1.5.4.5 (svn 1.4.6)\n> >\n> > ~/gitproj/gtk+$ git-svn rebase\n> > Apache got a malformed URI: REPORT request failed on\n> > '/svn/gtk+/!svn/vcc/default': Unusable URI: it does not refer to this\n> > repository at /usr/local/bin/git-svn line 3821\n>\n> I've known of this bug for a while but didn't track it down until\n> now. Please let me know if this fixes things for you and if\n> there are any regressions; thanks.\n>\n> From a9ebe54adf7ae2620fba1f638dee9566f8ccca82 Mon Sep 17 00:00:00 2001\n> From: Eric Wong \n> Date: Mon, 7 Apr 2008 00:41:44 -0700\n> Subject: [PATCH] git-svn: fix cloning of HTTP URLs with '+' in their path\n>\n> With this, git svn clone -s http://svn.gnome.org/svn/gtk+\n> is successful.\n\nFirst of all, thanks for your reply.\n\nI applied the patch, but now 'git-svn rebase' gives me\na different error.\n\nfirst, some context (I am on a branch based on remote trunk):\n\n~/gitproj/gtk+$ git log | head\ncommit e350328dee85f872db7689bf4ec7b577419333ee\nAuthor: tvb \nDate: Sun Apr 6 03:10:23 2008 +0000\n\n * gtk/gtkwidget.c: Clarified a g_warning message regarding\n parsing accelerators from builder files.\n\n git-svn-id: http://svn.gnome.org/svn/gtk+/trunk@19978\n7eb1c76a-c725-0410-a3b5-a37faf6256f8\n\n\nTrying with the latest git from the maint branch, with your patch applied:\n\n~/gitproj/gtk+$ git-svn --version\ngit-svn version 1.5.4.5.dirty (svn 1.4.6)\n\n~/gitproj/gtk+$ git-svn rebase\nIndex mismatch: d486332848849ca1e0555d4608df396946e20ad0 !=\nee3933caad632a093c1f7d98b813298ee806f333\nrereading e350328dee85f872db7689bf4ec7b577419333ee\n M Makefile.decl\n D gtk/compose-parse.py\n D gtk/gtkimcontextsimpleseqs.h\n D gtk/gtkmountoperation.c\n D gtk/gtkmountoperation.h\n M gtk/gtkprogressbar.c\n M gtk/gtkfilechooserentry.h\n M gtk/gtktreeitem.c\n M gtk/gtkfilechooserdialog.c\n M gtk/gtkwidget.c\n M gtk/gtktreemodelfilter.c\n M gtk/gtkwidget.h\n M gtk/gtkfixed.c\n M gtk/gtkexpander.c\n[lots and lots of lines snipped]\n M gdk/gdkgc.h\n M gdk/gdkcairo.h\n M gdk/Makefile.am\n M gdk/x11/gdkdisplay-x11.c\n M gdk/x11/gdkkeys-x11.c\n M gdk/x11/gdkscreen-x11.c\n M gdk/x11/gdkprivate-x11.h\n M gdk/x11/gdkgeometry-x11.c\n M gdk/x11/gdkinput-x11.c\n M gdk/x11/gdktestutils-x11.c\n M gdk/x11/gdkwindow-x11.c\n M gdk/x11/gdkcolor-x11.c\n M gdk/x11/gdkmain-x11.c\n M gdk/x11/gdkgc-x11.c\n M Makefile.am\n M examples/scribble-xinput/scribble-xinput.c\nW: -empty_dir: trunk/modules/other/gail/tests\nLast fetched revision of refs/remotes/trunk was r19978, but we are\nabout to fetch: r19234!\n\n\nTrying with an old git version from my encap directory:\n\n:~/gitproj/gtk+$ /usr/local/encap/git-1.5.3_20071207/bin/git-svn rebase\nIndex mismatch: d486332848849ca1e0555d4608df396946e20ad0 !=\nee3933caad632a093c1f7d98b813298ee806f333\nrereading e350328dee85f872db7689bf4ec7b577419333ee\n M gtk/gtkmenushell.c\n M ChangeLog\nr19981 = c8db7cf297fa5c309e8723b3eb0ee31be3413bf8 (trunk)\n M gtk/gtkfilesystem.c\n M ChangeLog\nr19982 = f180aa33ce1d3b64305d4e7a7370f58027355767 (trunk)\n M demos/gtk-demo/builder.c\n M ChangeLog\nr19985 = 36b09bfe222bd87c7463ac3042325c864fe5de7a (trunk)\nFirst, rewinding head to replay your work on top of it...\nHEAD is now at 36b09bf... 2008-04-08 Tor Lillqvist \nFast-forwarded my/trunk to refs/remotes/trunk.\n\n\nBefore reverting your patch, I tried with the glib repository, that one\nhas no special chars in svn url:\n\n~/gitproj/glib$ git-svn rebase\n M glib/gunicode.h\n M ChangeLog\nr6843 = b38a1500f212791de7b179cf358d2593d3afcc9d (trunk)\nFirst, rewinding head to replay your work on top of it...\nHEAD is now at b38a150... 2008-04-08 Behdad Esfahbod \nFast-forwarded my/trunk to refs/remotes/trunk.\n~/gitproj/glib$\n\nThat one worked perfectly. Now I reverted your patch, and tried\nagain on gtk+ repo with vanilla upstream git from maint branch:\n\n~/gitproj/gtk+$ git-svn rebase\nApache got a malformed URI: REPORT request failed on\n'/svn/gtk+/!svn/vcc/default': Unusable URI: it does not refer to this\nrepository at /usr/local/bin/git-svn line 3821\n\n\nregards,\npanagiotis\n"},{"id":"76560","messageId":"20080511000953.GA3128@yp-box.dyndns.org","threadId":"12952","inReplyTo":"d06901f0804081454r76a373e6h745f99a9dcbd6bc5@mail.gmail.com","subject":"Re: git-svn: regression with funny chars in svn repo url","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2008-05-11T00:10:03Z","receivedAt":"2008-05-11T00:10:03Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Hi again, sorry I've forgotten about this issue for a while :x\n\nPanagiotis Vossos wrote:\n> On Mon, Apr 7, 2008 at 11:11 AM, Eric Wong wrote:\n> \n> > Panagiotis Vossos wrote:\n> > > I keep a copy of the gtk+ svn repository on my machine and I have\n> > > noticed the following bug with git-svn:\n> > >\n> > > ~/gitproj/gtk+$ git-svn --version\n> > > git-svn version 1.5.4.5 (svn 1.4.6)\n> > >\n> > > ~/gitproj/gtk+$ git-svn rebase\n> > > Apache got a malformed URI: REPORT request failed on\n> > > '/svn/gtk+/!svn/vcc/default': Unusable URI: it does not refer to this\n> > > repository at /usr/local/bin/git-svn line 3821\n> >\n> > I've known of this bug for a while but didn't track it down until\n> > now. Please let me know if this fixes things for you and if\n> > there are any regressions; thanks.\n> >\n> > From a9ebe54adf7ae2620fba1f638dee9566f8ccca82 Mon Sep 17 00:00:00 2001\n> > From: Eric Wong \n> > Date: Mon, 7 Apr 2008 00:41:44 -0700\n> > Subject: [PATCH] git-svn: fix cloning of HTTP URLs with '+' in their path\n> >\n> > With this, git svn clone -s http://svn.gnome.org/svn/gtk+\n> > is successful.\n> \n> First of all, thanks for your reply.\n> \n> I applied the patch, but now 'git-svn rebase' gives me\n> a different error.\n> \n> first, some context (I am on a branch based on remote trunk):\n> \n> ~/gitproj/gtk+$ git log | head\n> commit e350328dee85f872db7689bf4ec7b577419333ee\n> Author: tvb \n> Date: Sun Apr 6 03:10:23 2008 +0000\n> \n> * gtk/gtkwidget.c: Clarified a g_warning message regarding\n> parsing accelerators from builder files.\n> \n> git-svn-id: http://svn.gnome.org/svn/gtk+/trunk@19978\n> 7eb1c76a-c725-0410-a3b5-a37faf6256f8\n> \n> \n> Trying with the latest git from the maint branch, with your patch applied:\n> \n> ~/gitproj/gtk+$ git-svn --version\n> git-svn version 1.5.4.5.dirty (svn 1.4.6)\n> \n> ~/gitproj/gtk+$ git-svn rebase\n> Index mismatch: d486332848849ca1e0555d4608df396946e20ad0 !=\n> ee3933caad632a093c1f7d98b813298ee806f333\n> rereading e350328dee85f872db7689bf4ec7b577419333ee\n> M Makefile.decl\n> D gtk/compose-parse.py\n> D gtk/gtkimcontextsimpleseqs.h\n> D gtk/gtkmountoperation.c\n> D gtk/gtkmountoperation.h\n> M gtk/gtkprogressbar.c\n> M gtk/gtkfilechooserentry.h\n> M gtk/gtktreeitem.c\n> M gtk/gtkfilechooserdialog.c\n> M gtk/gtkwidget.c\n> M gtk/gtktreemodelfilter.c\n> M gtk/gtkwidget.h\n> M gtk/gtkfixed.c\n> M gtk/gtkexpander.c\n> [lots and lots of lines snipped]\n> M gdk/gdkgc.h\n> M gdk/gdkcairo.h\n> M gdk/Makefile.am\n> M gdk/x11/gdkdisplay-x11.c\n> M gdk/x11/gdkkeys-x11.c\n> M gdk/x11/gdkscreen-x11.c\n> M gdk/x11/gdkprivate-x11.h\n> M gdk/x11/gdkgeometry-x11.c\n> M gdk/x11/gdkinput-x11.c\n> M gdk/x11/gdktestutils-x11.c\n> M gdk/x11/gdkwindow-x11.c\n> M gdk/x11/gdkcolor-x11.c\n> M gdk/x11/gdkmain-x11.c\n> M gdk/x11/gdkgc-x11.c\n> M Makefile.am\n> M examples/scribble-xinput/scribble-xinput.c\n> W: -empty_dir: trunk/modules/other/gail/tests\n> Last fetched revision of refs/remotes/trunk was r19978, but we are\n> about to fetch: r19234!\n\nReally weird. This could be a rev_db => rev_map migration issues, but I\nhaven't been able to reproduce any of it. However, for most users\n(those not using noMetadata or useSvmProps options, just blowing away\nrev_db is safe).\n\n-- \nEric Wong\n"},{"id":"76562","messageId":"20080511001449.GA29155@yp-box.dyndns.org","threadId":"12952","inReplyTo":"20080511000953.GA3128@yp-box.dyndns.org","subject":"[PATCH] git-svn: fix cloning of HTTP URLs with '+' in their path","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2008-05-11T00:14:49Z","receivedAt":"2008-05-11T00:14:49Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"With this, git svn clone -s http://svn.gnome.org/svn/gtk+\nis successful.\n\nAlso modified the funky rename test for this, which _does_\ninclude escaped '+' signs for HTTP URLs. SVN seems to accept\neither \"+\" or \"%2B\" in filenames and directories (just not the\nmain URL), so I'll leave it alone for now.\n\nSigned-off-by: Eric Wong \n---\n git-svn.perl | 2 +-\n t/lib-git-svn.sh | 9 ++++++-\n t/t9115-git-svn-dcommit-funky-renames.sh | 35 +++++++++++++++++++++++++++++-\n 3 files changed, 42 insertions(+), 4 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex e47b1ea..413e0b1 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3673,7 +3673,7 @@ sub escape_uri_only {\n \tmy ($uri) = @_;\n \tmy @tmp;\n \tforeach (split m{/}, $uri) {\n-\t\ts/([^\\w.%-]|%(?![a-fA-F0-9]{2}))/sprintf(\"%%%02X\",ord($1))/eg;\n+\t\ts/([^\\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf(\"%%%02X\",ord($1))/eg;\n \t\tpush @tmp, $_;\n \t}\n \tjoin('/', @tmp);\ndiff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh\nindex 9decd2e..d8f3355 100644\n--- a/t/lib-git-svn.sh\n+++ b/t/lib-git-svn.sh\n@@ -73,11 +73,16 @@ for d in \\\n done\n \n start_httpd () {\n+\trepo_base_path=\"$1\"\n \tif test -z \"$SVN_HTTPD_PORT\"\n \tthen\n \t\techo >&2 'SVN_HTTPD_PORT is not defined!'\n \t\treturn\n \tfi\n+\tif test -z \"$repo_base_path\"\n+\tthen\n+\t\trepo_base_path=svn\n+\tfi\n \n \tmkdir \"$GIT_DIR\"/logs\n \n@@ -90,13 +95,13 @@ LockFile logs/accept.lock\n Listen 127.0.0.1:$SVN_HTTPD_PORT\n LoadModule dav_module $SVN_HTTPD_MODULE_PATH/mod_dav.so\n LoadModule dav_svn_module $SVN_HTTPD_MODULE_PATH/mod_dav_svn.so\n-\n+\n \tDAV svn\n \tSVNPath $rawsvnrepo\n \n EOF\n \t\"$SVN_HTTPD_PATH\" -f \"$GIT_DIR\"/httpd.conf -k start\n-\tsvnrepo=http://127.0.0.1:$SVN_HTTPD_PORT/svn\n+\tsvnrepo=\"http://127.0.0.1:$SVN_HTTPD_PORT/$repo_base_path\"\n }\n \n stop_httpd () {\ndiff --git a/t/t9115-git-svn-dcommit-funky-renames.sh b/t/t9115-git-svn-dcommit-funky-renames.sh\nindex 182299c..4acbcb0 100755\n--- a/t/t9115-git-svn-dcommit-funky-renames.sh\n+++ b/t/t9115-git-svn-dcommit-funky-renames.sh\n@@ -9,7 +9,7 @@ test_description='git-svn dcommit can commit renames of files with ugly names'\n \n test_expect_success 'load repository with strange names' \"\n \tsvnadmin load -q $rawsvnrepo < ../t9115/funky-names.dump &&\n-\tstart_httpd\n+\tstart_httpd gtk+\n \t\"\n \n test_expect_success 'init and fetch repository' \"\n@@ -49,6 +49,39 @@ test_expect_success 'rename pretty file into ugly one' '\n \tgit svn dcommit\n \t'\n \n+test_expect_success 'add a file with plus signs' '\n+\techo .. > +_+ &&\n+\tgit update-index --add +_+ &&\n+\tgit commit -m plus &&\n+\tmkdir gtk+ &&\n+\tgit mv +_+ gtk+/_+_ &&\n+\tgit commit -m plus_dir &&\n+\tgit svn dcommit\n+\t'\n+\n+test_expect_success 'clone the repository to test rebase' \"\n+\tgit svn clone $svnrepo test-rebase &&\n+\tcd test-rebase &&\n+\t\techo test-rebase > test-rebase &&\n+\t\tgit add test-rebase &&\n+\t\tgit commit -m test-rebase &&\n+\t\tcd ..\n+\t\"\n+\n+test_expect_success 'make a commit to test rebase' \"\n+\t\techo test-rebase-main > test-rebase-main &&\n+\t\tgit add test-rebase-main &&\n+\t\tgit commit -m test-rebase-main &&\n+\t\tgit svn dcommit\n+\t\"\n+\n+test_expect_success 'git-svn rebase works inside a fresh-cloned repository' \"\n+\tcd test-rebase &&\n+\t\tgit svn rebase &&\n+\t\ttest -e test-rebase-main &&\n+\t\ttest -e test-rebase\n+\t\"\n+\n stop_httpd\n \n test_done\n-- \nEric Wong\n"}]}