Rev 4508: (Andy Kilner) Leave tildes as they are in transport URLs. in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 4508 [merge]
revision-id: pqm at pqm.ubuntu.com-20090704093710-udcizb09il1uu4yf
parent: pqm at pqm.ubuntu.com-20090703154118-f5ncmxfk75wgzh6l
parent: jml at canonical.com-20090704083734-1lkels22pu9p5q8r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2009-07-04 10:37:10 +0100
message:
  (Andy Kilner) Leave tildes as they are in transport URLs.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
=== modified file 'NEWS'
--- a/NEWS	2009-07-03 14:41:31 +0000
+++ b/NEWS	2009-07-04 09:37:10 +0000
@@ -171,6 +171,9 @@
   Performance is also significantly improved when requesting multiple revs
   at once.  (Matthew Fuller, John Arbash Meinel)
 
+* Tildes are no longer escaped by Transports. (Andy Kilner)
+
+
 Documentation
 *************
 

=== modified file 'bzrlib/tests/test_smart_transport.py'
--- a/bzrlib/tests/test_smart_transport.py	2009-04-27 03:27:46 +0000
+++ b/bzrlib/tests/test_smart_transport.py	2009-07-04 08:37:34 +0000
@@ -3526,7 +3526,7 @@
         # still work correctly.
         base_transport = remote.RemoteHTTPTransport('bzr+http://host/%7Ea/b')
         new_transport = base_transport.clone('c')
-        self.assertEqual('bzr+http://host/%7Ea/b/c/', new_transport.base)
+        self.assertEqual('bzr+http://host/~a/b/c/', new_transport.base)
         self.assertEqual(
             'c/',
             new_transport._client.remote_path_from_transport(new_transport))

=== modified file 'bzrlib/transport/__init__.py'
--- a/bzrlib/transport/__init__.py	2009-06-10 03:56:49 +0000
+++ b/bzrlib/transport/__init__.py	2009-07-03 15:42:35 +0000
@@ -1390,7 +1390,7 @@
             netloc = '%s@%s' % (urllib.quote(user), netloc)
         if port is not None:
             netloc = '%s:%d' % (netloc, port)
-        path = urllib.quote(path)
+        path = urlutils.escape(path)
         return urlparse.urlunparse((scheme, netloc, path, None, None, None))
 
     def relpath(self, abspath):