Merge lp:~cleekbi/bzr-svn/allow-spaces into lp:bzr-svn/1.0

[Billie Cleek]

[Jelmer Vernooij (jelmer)]

Please provide a patch that demonstrates that this change is actually necessary, e.g. attempting to open a location with spaces in it using Transport

E.g. please try: "bzr ls http://svn.gnome.org/svn/gtk+/branches/branch%20with%20spaces"

This breaks badly with your patch but works fine with current bzr-svn (although it gives a 404).

review: Disapprove

[Billie Cleek (cleekbi)]

I have modified the branch to unescape the uri prior to escaping it, to ensure that any escaped sequences don't get their escape character escaped. However, I am not able to see "breaks badly", because executing "bzr ls http://svn.gnome.org/svn/gtk+/branches/branch%20with%20spaces" with the most recent release, 1.0.1, gives

2.875 Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 842, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1037, in run_bzr
  File "bzrlib\commands.pyo", line 654, in run_argv_aliases
  File "bzrlib\commands.pyo", line 1052, in ignore_pipe
  File "bzrlib\builtins.pyo", line 2487, in run
  File "bzrlib\bzrdir.pyo", line 973, in open_containing_tree_or_branch
  File "bzrlib\bzrdir.pyo", line 945, in _get_tree_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\remote.py", line 224, in open_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\remote.py", line 142, in find_repository
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\repository.py", line 390, in __init__
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\transport.py", line 362, in get_uuid
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\transport.py", line 320, in get_connection
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\transport.py", line 272, in get
SubversionException: ("'http://svn.gnome.org/svn/gtk%2B' isn't in the same repository as 'http://svn.gnome.org/svn/gtk+'", 170000)

I will gladly make any modifications that I need to make to ensure that urls with spaces are properly handled.

[Jelmer Vernooij (jelmer)]

With the current trunk of bzr-svn I get a 404 when I attempt to do that.

With your change, I get the error you've pasted.

[Billie Cleek (cleekbi)]

With my fix, I get this (copied from the BZR_LOG:
0.078 bzr arguments: [u'ls', u'http://svn.gnome.org/svn/gtk+/trunk/']
0.078 looking for plugins in C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins
0.187 looking for plugins in C:/Program Files/Bazaar/plugins
0.187 Plugin name svn already loaded
0.250 encoding stdout as sys.stdout encoding 'cp437'
0.312 bzr-svn: using Subversion 1.5.6 ()
4.125 potential branching layouts: [('trunk0', 301)]
4.125 Guessed repository layout: TrunkLayout(0), guess layout to use: CustomLayout(['runk'],[])
5.703 Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 842, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1037, in run_bzr
  File "bzrlib\commands.pyo", line 654, in run_argv_aliases
  File "bzrlib\commands.pyo", line 1052, in ignore_pipe
  File "bzrlib\builtins.pyo", line 2487, in run
  File "bzrlib\bzrdir.pyo", line 973, in open_containing_tree_or_branch
  File "bzrlib\bzrdir.pyo", line 945, in _get_tree_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\remote.py", line 229, in open_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\svn\branch.py", line 189, in __init__
NotBranchError: Not a branch: "http://svn.gnome.org/svn/gtk%2B/runk".

With the current trunk I get (copied straight from my command window so you can see the plugin version number):

C:\Platform\ExampleAll>bzr ls "http://svn.gnome.org/svn/gtk+/trunk/"
bzr: ERROR: subvertpy.SubversionException: ("'http://svn.gnome.org/svn/gtk%2B' i
sn't in the same repository as 'http://svn.gnome.org/svn/gtk+'", 170000)

Traceback (most recent call last):
  File "bzrlib\commands.pyo", line 842, in exception_to_return_code
  File "bzrlib\commands.pyo", line 1037, in run_bzr
  File "bzrlib\commands.pyo", line 654, in run_argv_aliases
  File "bzrlib\commands.pyo", line 1052, in ignore_pipe
  File "bzrlib\builtins.pyo", line 2487, in run
  File "bzrlib\bzrdir.pyo", line 973, in open_containing_tree_or_branch
  File "bzrlib\bzrdir.pyo", line 945, in _get_tree_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\remote.py", line 228, in open_branch
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\remote.py", line 142, in find_repository
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\repository.py", line 394, in __init__
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\transport.py", line 405, in get_uuid
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\transport.py", line 360, in get_connection
  File "C:/Documents and Settings/cleekbi/Application Data/bazaar/2.0/plugins\sv
n\transport.py", line 312, in get
SubversionException: ("'http://svn.gnome.org/svn/gtk%2B' isn't in the same repos
itory as 'http://svn.gnome.org/svn/gtk+'", 170000)

bzr 2.0.3 on python 2.5.4 (Windows-XP-5.1.2600-SP2)
arguments: ['bzr', 'ls', 'http://svn.gnome.org/svn/gtk+/trunk/']
encoding: 'cp1252', fsenc: 'mbcs', lang: None
plugins:
  bzrtools C:\Program Files\Bazaar\plugin...

[Billie Cleek (cleekbi)]

I just tested "bzr ls http://svn.gnome.org/svn/gtk+" using the bzr 2.0.3 release for Mac OS X, which includes bzr-svn 1.0.1, and got the same errors with a very similar stacktrace that I reported above for trunk without my fix.

Unmerged revisions

3241. By Billie H. Cleek <email address hidden> on 2010-01-14

FIXED: unit tests would always fail due to mixture of exepected escape sequences

3240. By Billie Cleek on 2010-01-11

1. FIXED: urls containing spaces fail on all operations that require contacting the repository. escape urls before passing to subverpty.
2. added test cases for urls containing spaces

=== modified file 'tests/test_transport.py'
--- tests/test_transport.py	2009-07-20 14:58:55 +0000
+++ tests/test_transport.py	2010-01-11 02:16:15 +0000
@@ -222,10 +222,14 @@
     def test_url_unescape_uri(self):
         self.assertEquals("http://svn.gnome.org/svn/gtk+/trunk",
                 _url_unescape_uri("http://svn.gnome.org/svn/gtk%2B/trunk"))
+        self.assertEquals("http://svn.gnome.org/svn/gtk+/branches/branch%20with%20spaces",
+                _url_unescape_uri("http://svn.gnome.org/svn/gtk%2B/branches/branch with spaces"))
 
     def test_url_escape_uri(self):
         self.assertEquals("http://svn.gnome.org/svn/gtk%2B/trunk",
                 _url_escape_uri("http://svn.gnome.org/svn/gtk+/trunk"))
+        self.assertEquals("http://svn.gnome.org/svn/gtk%2B/branches/branch with spaces",
+                _url_escape_uri("http://svn.gnome.org/svn/gtk+/branches/branch%20with%20spaces"))
 
     def test_url_join_unescaped_path(self):
         self.assertEquals("http://svn.gnome.org/svn/gtk%2B/trunk",

=== modified file 'transport.py'
--- transport.py	2009-11-24 14:15:33 +0000
+++ transport.py	2010-01-11 02:16:15 +0000
@@ -246,7 +246,7 @@
         progress_cb = None
     assert type(url) == str
     try:
-        ret = subvertpy.ra.RemoteAccess(url, auth=auth,
+        ret = subvertpy.ra.RemoteAccess(_url_escape_uri(url), auth=auth,
                 client_string_func=bzrlib.plugins.svn.get_client_string,
                 progress_cb=progress_cb)
         if 'transport' in debug.debug_flags: