At file:///data/jelmer/bzr-svn/experimental/
------------------------------------------------------------
revno: 326
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: experimental
timestamp: Mon 2008-12-08 17:03:58 +0100
message:
Merge new upstream snapshot.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
debian/changelog changelog-20061009030331-beff4307o0ccq70i-3
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
------------------------------------------------------------
revno: 220.81.570
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Jelmer Vernooij <[EMAIL PROTECTED]>
branch nick: 0.5
timestamp: Mon 2008-12-08 17:01:50 +0100
message:
handle forward slashes in the path part of a url.
modified:
NEWS news-20061231030336-h9fhq245ie0de8bs-1
tests/test_radir.py
test_radir.py-20061231173434-31utf9o4byu7wktm-1
transport.py
transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'NEWS'
--- a/NEWS 2008-12-08 15:27:20 +0000
+++ b/NEWS 2008-12-08 16:03:58 +0000
@@ -7,6 +7,8 @@
* Fix some tests when running overall bzr testsuite. (#306158)
+ * Handle duplicate forward slashes in the path part of a URL.
+
bzr-svn 0.5.0~rc1 2008-12-08
CHANGES
=== modified file 'debian/changelog'
--- a/debian/changelog 2008-12-08 15:43:34 +0000
+++ b/debian/changelog 2008-12-08 16:03:58 +0000
@@ -1,3 +1,10 @@
+bzr-svn (0.5.0~rc1+bzr2239-1) UNRELEASED; urgency=low
+
+ * New upstream snapshot.
+ + Fixes handling of multiple forward slashes in URLs. (Closes: #507887)
+
+ -- Jelmer Vernooij <[EMAIL PROTECTED]> Mon, 08 Dec 2008 17:03:14 +0100
+
bzr-svn (0.5.0~rc1+bzr2238-1) experimental; urgency=low
* New upstream snapshot.
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2008-12-08 03:07:18 +0000
+++ b/tests/test_radir.py 2008-12-08 16:03:58 +0000
@@ -44,6 +44,13 @@
x = BzrDir.open(repos_url)
x.break_lock()
+ def test_too_much_slashes(self):
+ repos_url = self.make_repository("d")
+
+ repos_url = repos_url[:-1] + "///d"
+
+ BzrDir.open(repos_url)
+
def test_open_workingtree(self):
repos_url = self.make_repository("d")
x = BzrDir.open(repos_url)
=== modified file 'transport.py'
--- a/transport.py 2008-12-08 03:07:18 +0000
+++ b/transport.py 2008-12-08 16:03:58 +0000
@@ -72,6 +72,8 @@
if scheme in ("http", "https"):
# Without this, URLs with + in them break
path = urllib.unquote(path)
+ while "//" in path:
+ path = path.replace("//", "/")
return urlparse.urlunsplit((scheme, netloc, path, query, fragment))
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
