Bazaar

Bug #133965
Comment #13

Comment 13 for bug 133965

Revision history for this message

James Westby (james-w) wrote on 2007-08-28: Re: [MERGE][Bug 133965] PathNotChild, port mismatch with "bzr info" for bzr:// smartserver

#13

On (27/08/07 21:40), Robert Collins wrote:
> I feel strongly that as no other issues have arrived it should be the
> final release. We're 2 weeks into 0.91 at this point.

Ok, two for the final release, and no one else speaking up against, so
we should go for this. Could someone please merge the attached two
bundles. (The second wont show up in BB I believe, but it is trivial).

The second does rely on both getting merged by the end of today. Would
it be acceptable to do a release from my local branch rather than a PQM
branch if that is not the case?

Thanks,

James

--
James Westby -- GPG Key ID: B577FE13 -- http://jameswestby.net/
seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: <email address hidden>-\
# 672l6nisr283ybdc
# target_branch: http://bazaar-vcs.org/bzr/bzr.0.90/
# testament_sha1: 5fe509622ea1c6904199e90ff155694122eadee4
# timestamp: 2007-08-27 22:04:22 +0100
# base_revision_id: <email address hidden>
#
# Begin patch
=== modified file 'NEWS'
--- NEWS 2007-08-21 20:54:11 +0000
+++ NEWS 2007-08-27 21:01:57 +0000
@@ -18,6 +18,13 @@
from the developer document catalog back to the main one.
(Ian Clatworthy, Sabin Iacob, Alexander Belchenko)

+ BUGFIXES:
+
+ * Fix ''bzr info bzr://host/'' and other operations on ''bzr://' URLs with
+ an implicit port. We were incorrectly raising PathNotChild due to
+ inconsistent treatment of the ''_port'' attribute on the Transport object.
+ (John Arbash Meinel, Andrew Bennetts, #133965)
+

bzr 0.90rc1 2007-08-14
======================

# TODO: Should possibly split transport-specific tests into their own files.
@@ -714,6 +717,31 @@
self.assertIsNot(t1, t2)

+class TestRemoteTCPTransport(TestCase):
+ """Tests for bzr:// transport (RemoteTCPTransport)."""
+
+ def test_relpath_with_implicit_port(self):
+ """Connected transports with the same URL are the same, even if the
+ port is implicit.
+
+ So t.relpath(url) should always be '' if t.base is the same as url, or
+ if the only difference is that one explicitly specifies the default
+ port and the other doesn't specify a port.
+ """
+ t_implicit_port = RemoteTCPTransport('bzr://host.com/')
+ self.assertEquals('', t_implicit_port.relpath('bzr://host.com/'))
+ t_explicit_port = RemoteTCPTransport('bzr://host.com:4155/')
+ self.assertEquals('', t_explicit_port.relpath('bzr://host.com:4155/'))
+
+ def test_url_includes_non_default_port(self):
+ """Non-default ports are included in the transport's URL.
+
+ Contrast this to `test_url_omits_default_port`.
+ """
+ t = get_transport('bzr://host.com:666/')
+ self.assertEquals('bzr://host.com:666/', t.base)
+
+
def get_test_permutations():
"""Return transport permutations to be used in testing.

=== modified file 'bzrlib/transport/remote.py'
--- bzrlib/transport/remote.py 2007-07-30 14:36:04 +0000
+++ bzrlib/transport/remote.py 2007-08-27 21:01:57 +0000
@@ -443,9 +443,10 @@

def _build_medium(self):
assert self.base.startswith('bzr://')
- if self._port is None:
- self._port = BZR_DEFAULT_PORT
- return medium.SmartTCPClientMedium(self._host, self._port), None
+ port = self._port
+ if port is None:
+ port = BZR_DEFAULT_PORT
+ return medium.SmartTCPClientMedium(self._host, port), None

class RemoteSSHTransport(RemoteTransport):

# Begin bundle
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
8Ii/w/Uc9rZBlVJf+LuSKcKEhjSWEUg=

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: <email address hidden>-\
# r1lgdit95z8zujk9
# target_branch: http://bazaar-vcs.org/bzr/bzr.0.90/
# testament_sha1: a5b4e034b695bd695f2c370c18f7f965ab09d95f
# timestamp: 2007-08-27 22:17:55 +0100
# base_revision_id: <email address hidden>
#
# Begin patch
=== modified file 'NEWS'
--- NEWS 2007-08-21 20:54:11 +0000
+++ NEWS 2007-08-27 21:17:41 +0000
@@ -4,7 +4,7 @@

.. contents::

-bzr 0.90 2007-08-22
+bzr 0.90 2007-08-28
===================

IMPROVEMENTS:

# Begin bundle
IyBCYXphYXIgcmV2aXNpb24gYnVuZGxlIHY0CiMKQlpoOTFBWSZTWc86GswAAW3fgAAQUWv//1oR
CIC////wUAMte0CgaAJJQ1Cep6T2pqP0p5QzUyaZGQbSeoP1JjAaAAAaAAAAAANCJkmmAmjQAyNA
0AaaAMBoAABoAAAAAAkkmjE0E2kaTEwU2lPKeU9RiYT9Uyeqxm4QPSFLlmGXQ3XT2SucBDJI0lE3
Jnm17Mxfh8L8caeVEQ3gdrvMd34OiBFwGopzCIgkZTK5XhVjpOSoElT5UENBiiBXQO+0wnZRy+rU
oRk6lFWWgUKkq7n2+yJWKxk5jy28PAAidk8KRRXmOSPV4ih2IBIGCicREsyaCZDmGhdgiBUHBGkv
KZnGwLVCAIwxJjgQMzEgZFxYLHBaGthF1wp2Msk0GFZYGiu1wIDo1hSun8Go0MbjETH6tcVCnAqe
sLvTHM8DMzNmqhKZgf8bpGNakrFiQrMi8eLZrMnSYv0TjwIDiBfenOEOJCtNpIvAxMC2NamaFZjO
F41t8y4cDmFIwLDAgr2cT2i9BbykyhlCh2FkOMDIjgztsmGVSkawrtP5VbC9mO9viWHJ2jP8qlx+
Y10KagYaKUAKifWAY8Qp5JoeO0mFS68RgHdrkhNA4GR0ia8x0jWHpcfjuBe8Cu/zmi3wV3y5mo4D
yJUQA25L+lig4eLBxLgmcyMfI27MW7Lx2K7J2ECKoVJ0g8iUzAkaj7gTwedxfFFv99rq3vmaYnR3
TPiSNvuXzeES+pwFvHmf4mQ++WqgYbhl5/QBwFAJWgST8qbHdf7yKHM9wsGNR8+vXJlbv3CfyFT9
fjE3h3rLbk7b9QGn/4PN5rTjL/Ql31ufgB918gJxaJq+QHsK+MMDSmtOIqw6VcteoXjlufrX+K5Y
lhvnUA2yFVB9QVAMG4dUFXwA6rf6LJPZGpOXTALdAeB7PR1CxezlhqlSlFNWqwgEr+K4RLbRrBYZ
tkZiaYduGUEW9apsqo2RXZa6rwmrCxhk3JrBm5H5XrvWrNXG4BoqQJ6GArYCsUOTz1JiHOjQr+HG
PiOIhmKplNk4iua894ueillJMBoBUBBbIVqE5uAc5uHT6C2aiMT6i/Yu5IpwoSGedDWY

On (27/08/07 21:40), Robert Collins wrote:
> I feel strongly that as no other issues have arrived it should be the
> final release. We're 2 weeks into 0.91 at this point.

The second does rely on both getting merged by the end of today. Would
it be acceptable to do a release from my local branch rather than a PQM
branch if that is not the case?

Thanks,

James

-- 
  James Westby   --    GPG Key ID: B577FE13    --     http://jameswestby.net/
  seccure key - (3+)k7|M*edCX/.A:n*N!>|&7U.L#9E)Tu)T0>AM - secp256r1/nistp256

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jw+debian@jameswestby.net-20070827210157-\
#   672l6nisr283ybdc
# target_branch: http://bazaar-vcs.org/bzr/bzr.0.90/
# testament_sha1: 5fe509622ea1c6904199e90ff155694122eadee4
# timestamp: 2007-08-27 22:04:22 +0100
# base_revision_id: pqm@pqm.ubuntu.com-20070822004557-ipcsdwnro02sbrpd
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-21 20:54:11 +0000
+++ NEWS	2007-08-27 21:01:57 +0000
@@ -18,6 +18,13 @@
       from the developer document catalog back to the main one.
       (Ian Clatworthy, Sabin Iacob, Alexander Belchenko)
 
+  BUGFIXES:
+
+    * Fix ''bzr info bzr://host/'' and other operations on ''bzr://' URLs with
+      an implicit port.  We were incorrectly raising PathNotChild due to
+      inconsistent treatment of the ''_port'' attribute on the Transport object.
+      (John Arbash Meinel, Andrew Bennetts, #133965)
+
 
 bzr 0.90rc1 2007-08-14
 ======================

=== modified file 'bzrlib/tests/test_transport.py'
--- bzrlib/tests/test_transport.py	2007-07-22 15:44:59 +0000
+++ bzrlib/tests/test_transport.py	2007-08-27 21:01:57 +0000
@@ -54,6 +54,9 @@
 from bzrlib.transport.memory import MemoryTransport
 from bzrlib.transport.local import (LocalTransport,
                                     EmulatedWin32LocalTransport)
+from bzrlib.transport.remote import (BZR_DEFAULT_PORT,
+                                     RemoteTCPTransport,
+                                     )
 
 
 # TODO: Should possibly split transport-specific tests into their own files.
@@ -714,6 +717,31 @@
         self.assertIsNot(t1, t2)
 
 
+class TestRemoteTCPTransport(TestCase):
+    """Tests for bzr:// transport (RemoteTCPTransport)."""
+
+    def test_relpath_with_implicit_port(self):
+        """Connected transports with the same URL are the same, even if the
+        port is implicit.
+
+        So t.relpath(url) should always be '' if t.base is the same as url, or
+        if the only difference is that one explicitly specifies the default
+        port and the other doesn't specify a port.
+        """
+        t_implicit_port = RemoteTCPTransport('bzr://host.com/')
+        self.assertEquals('', t_implicit_port.relpath('bzr://host.com/'))
+        t_explicit_port = RemoteTCPTransport('bzr://host.com:4155/')
+        self.assertEquals('', t_explicit_port.relpath('bzr://host.com:4155/'))
+
+    def test_url_includes_non_default_port(self):
+        """Non-default ports are included in the transport's URL.
+
+        Contrast this to `test_url_omits_default_port`.
+        """
+        t = get_transport('bzr://host.com:666/')
+        self.assertEquals('bzr://host.com:666/', t.base)
+
+
 def get_test_permutations():
     """Return transport permutations to be used in testing.

=== modified file 'bzrlib/transport/remote.py'
--- bzrlib/transport/remote.py	2007-07-30 14:36:04 +0000
+++ bzrlib/transport/remote.py	2007-08-27 21:01:57 +0000
@@ -443,9 +443,10 @@
 
     def _build_medium(self):
         assert self.base.startswith('bzr://')
-        if self._port is None:
-            self._port = BZR_DEFAULT_PORT
-        return medium.SmartTCPClientMedium(self._host, self._port), None
+        port = self._port
+        if port is None:
+            port = BZR_DEFAULT_PORT
+        return medium.SmartTCPClientMedium(self._host, port), None
 
 
 class RemoteSSHTransport(RemoteTransport):

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jw+debian@jameswestby.net-20070827211741-\
#   r1lgdit95z8zujk9
# target_branch: http://bazaar-vcs.org/bzr/bzr.0.90/
# testament_sha1: a5b4e034b695bd695f2c370c18f7f965ab09d95f
# timestamp: 2007-08-27 22:17:55 +0100
# base_revision_id: pqm@pqm.ubuntu.com-20070822004557-ipcsdwnro02sbrpd
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-21 20:54:11 +0000
+++ NEWS	2007-08-27 21:17:41 +0000
@@ -4,7 +4,7 @@
 
 .. contents::
 
-bzr 0.90 2007-08-22
+bzr 0.90 2007-08-28
 ===================
 
   IMPROVEMENTS: