[MERGE][#207558] Fix _SmartClient.remote_path_for_transport's handling of plain http: URLs.

[Andrew Bennetts]

This simple change fixes the core of bug #207558, which was introduced in
bzr.dev r3309.  It makes the client send the right paths when the transport
scheme is http and https (and not just when the transport scheme is bzr+http or
bzr+https).

Still to be done:
  * Fix bazaar.launchpad.net's smart server, which is currently suffering from
    bug #124089 (the fix for this landed in bzr.dev earlier today)
  * Offer some way for clients to explictly not use the smart server when using
    HTTP.  This may be useful for debugging, and also as a workaround if an HTTP
    server has a misconfigured bzr smart server.

-Andrew.

-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: andrew.bennetts at canonical.com-20080401115907-\
#   8a8txfptssz811mw
# target_branch: http://bazaar-vcs.org/bzr/bzr.dev
# testament_sha1: 750f25621b1971b0c2c6bcbddcd14e00f9cea873
# timestamp: 2008-04-01 22:59:22 +1100
# source_branch: http://people.ubuntu.com/~andrew/bzr/bug-207558
# base_revision_id: pqm at pqm.ubuntu.com-20080401035104-fnjlf47gtles4byl
# 
# Begin patch
=== modified file 'bzrlib/smart/client.py'
--- bzrlib/smart/client.py	2008-03-28 08:05:51 +0000
+++ bzrlib/smart/client.py	2008-03-28 09:07:01 +0000
@@ -87,7 +87,8 @@
         the medium from the matching transport.
         """
         base = self._base
-        if base.startswith('bzr+http://') or base.startswith('bzr+https://'):
+        if (base.startswith('bzr+http://') or base.startswith('bzr+https://')
+            or base.startswith('http://') or base.startswith('https://')):
             medium_base = self._base
         else:
             medium_base = urlutils.join(self._base, '/')

=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2008-03-28 08:05:51 +0000
+++ bzrlib/tests/test_remote.py	2008-04-01 11:59:07 +0000
@@ -46,6 +46,7 @@
 from bzrlib.smart import server, medium
 from bzrlib.smart.client import _SmartClient
 from bzrlib.symbol_versioning import one_four
+from bzrlib.transport import get_transport
 from bzrlib.transport.memory import MemoryTransport
 from bzrlib.transport.remote import RemoteTransport
 
@@ -183,6 +184,39 @@
         self.assertTrue(result)
 
 
+class Test_SmartClient_remote_path_from_transport(tests.TestCase):
+    """Tests for the behaviour of _SmartClient.remote_path_from_transport."""
+
+    def assertRemotePath(self, expected, client_base, transport_base):
+        """Assert that the result of _SmartClient.remote_path_from_transport
+        is the expected value for a given client_base and transport_base.
+        """
+        dummy_medium = 'dummy medium'
+        client = _SmartClient(dummy_medium, client_base)
+        transport = get_transport(transport_base)
+        result = client.remote_path_from_transport(transport)
+        self.assertEqual(expected, result)
+        
+    def test_remote_path_from_transport(self):
+        """_SmartClient.remote_path_from_transport calculates a URL for the
+        given transport relative to the root of the client base URL.
+        """
+        self.assertRemotePath('xyz/', 'bzr://host/path', 'bzr://host/xyz')
+        self.assertRemotePath(
+            'path/xyz/', 'bzr://host/path', 'bzr://host/path/xyz')
+
+    def test_remote_path_from_transport_http(self):
+        """Remote paths for HTTP transports are calculated differently to other
+        transports.  They are just relative to the client base, not the root
+        directory of the host.
+        """
+        for scheme in ['http:', 'https:', 'bzr+http:', 'bzr+https:']:
+            self.assertRemotePath(
+                '../xyz/', scheme + '//host/path', scheme + '//host/xyz')
+            self.assertRemotePath(
+                'xyz/', scheme + '//host/path', scheme + '//host/path/xyz')
+
+
 class TestBzrDirOpenBranch(tests.TestCase):
 
     def test_branch_present(self):

# Begin bundle
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
AYC3AM7boPTwUtO+XAmEeIu5IpwoSFDT2GYA