Rev 3572: (Michael Hudson) urutils.rebase_url handles '..' path segments in the in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

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

------------------------------------------------------------
revno: 3572
revision-id:pqm at pqm.ubuntu.com-20080722202646-5kwh910svyyumzre
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
parent: michael.hudson at canonical.com-20080722025510-uioyrzmam21fgu4y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 21:26:46 +0100
message:
  (Michael Hudson) urutils.rebase_url handles '..' path segments in the
  	url
modified:
  bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
    ------------------------------------------------------------
    revno: 3567.2.1
    revision-id:michael.hudson at canonical.com-20080722025510-uioyrzmam21fgu4y
    parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
    committer: Michael Hudson <michael.hudson at canonical.com>
    branch nick: rebase-..-paths
    timestamp: Tue 2008-07-22 14:55:10 +1200
    message:
      urlutils.rebase_url handles '..' path segments in 'url'
    modified:
      bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
      bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
=== modified file 'bzrlib/tests/test_urlutils.py'
--- a/bzrlib/tests/test_urlutils.py	2008-07-17 06:17:42 +0000
+++ b/bzrlib/tests/test_urlutils.py	2008-07-22 02:55:10 +0000
@@ -655,6 +655,8 @@
                          'http://baz/qux', 'http://baz/'))
         self.assertEqual('.', urlutils.rebase_url('foo',
                          'http://bar/', 'http://bar/foo/'))
+        self.assertEqual('qux/bar', urlutils.rebase_url('../bar',
+                         'http://baz/qux/foo', 'http://baz/'))
 
     def test_determine_relative_path(self):
         self.assertEqual('../../baz/bar',

=== modified file 'bzrlib/urlutils.py'
--- a/bzrlib/urlutils.py	2008-07-17 06:17:42 +0000
+++ b/bzrlib/urlutils.py	2008-07-22 02:55:10 +0000
@@ -667,7 +667,7 @@
     if (old_parsed[:2]) != (new_parsed[:2]):
         raise errors.InvalidRebaseURLs(old_base, new_base)
     return determine_relative_path(new_parsed[2],
-                                   osutils.pathjoin(old_parsed[2], url))
+                                   join(old_parsed[2], url))
 
 
 def determine_relative_path(from_path, to_path):