Merge lp:~tzeentch-gm/bzr-colo/1044975-remote-cw-base-fix into lp:bzr-colo

[Michael Gliwinski]

This fixes the problem described in #1044975

The bug only occurs when using a remote URL (i.e. non-localhost) so I'm not sure how to test it. Let me know if you have any suggestions and if this approach is OK (all existing tests pass for me).

Unmerged revisions

121. By Michael Gliwinski on 2012-09-02

Consider a remote ColocatedWorkspace as having no working tree.

Otherwise the remote working tree's branch is used to calculate repo location, but since the tree references this branch with a local (file:) URL, this causes repo_location to be a file: URL where it should be remote.

=== modified file 'colocated.py'
--- colocated.py	2011-11-28 05:03:30 +0000
+++ colocated.py	2012-09-02 13:17:19 +0000
@@ -29,6 +29,7 @@
                     osutils,
                    )
 
+from bzrlib.transport.local import LocalTransport
 from trace import mutter
 
 COLOCATED_LOCATION = osutils.pathjoin(u'.bzr', u'branches')
@@ -53,7 +54,10 @@
             a_bzrdir, extra_path = bzrdir.BzrDir.open_containing(location)
         except errors.NotBranchError:
             raise NoColocatedWorkspace(directory=location)
-        self.has_tree = a_bzrdir.has_workingtree()
+        self.has_tree = (
+            isinstance(a_bzrdir.transport, LocalTransport) and
+            a_bzrdir.has_workingtree()
+            )
 
         if not self.has_tree:
             self.base = urlutils.normalize_url(location)