Merge lp:~jelmer/brz/no-colo-name into lp:brz

[Jelmer Vernooij]

Don't use colocated branch names for derived branch directory names.

When running "bzr branch http://blah/blah", don't use the remote's colocated branch name to derived the local control dir name.

This is a bad idea for a couple of reasons:
 * unpredictable
 * most of the time, the remote's name is going to be "master" anyway

Instead, just derive the local name from the last part of the remote URL, as we do when there are no colocated branches involved.

[Martin Packman (gz)]

Makes sense.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-08-12 23:18:19 +0000
+++ breezy/builtins.py	2018-09-14 12:13:33 +0000
@@ -1460,9 +1460,7 @@
             # RBC 20060209
             revision_id = br_from.last_revision()
         if to_location is None:
-            to_location = getattr(br_from, "name", None)
-            if not to_location:
-                to_location = urlutils.derive_to_location(from_location)
+            to_location = urlutils.derive_to_location(from_location)
         to_transport = transport.get_transport(to_location)
         try:
             to_transport.mkdir('.')
 
=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2018-07-18 19:48:48 +0000
+++ breezy/tests/blackbox/test_branch.py	2018-09-14 12:13:33 +0000
@@ -98,13 +98,14 @@
 
     def test_from_colocated(self):
         """Branch from a colocated branch into a regular branch."""
-        tree = self.example_branch('a', format='development-colo')
+        os.mkdir('b')
+        tree = self.example_branch('b/a', format='development-colo')
         tree.controldir.create_branch(name='somecolo')
         out, err = self.run_bzr('branch %s,branch=somecolo' %
-            local_path_to_url('a'))
+            local_path_to_url('b/a'))
         self.assertEqual('', out)
         self.assertEqual('Branched 0 revisions.\n', err)
-        self.assertPathExists("somecolo")
+        self.assertPathExists('a')
 
     def test_branch_broken_pack(self):
         """branching with a corrupted pack file."""
 
=== modified file 'breezy/urlutils.py'
--- breezy/urlutils.py	2018-09-13 12:50:28 +0000
+++ breezy/urlutils.py	2018-09-14 12:13:33 +0000
@@ -811,6 +811,7 @@
     is used without a path, e.g. c:foo-bar => foo-bar.
     If no /, path separator or : is found, the from_location is returned.
     """
+    from_location, unused_params = split_segment_parameters(from_location)
     if from_location.find("/") >= 0 or from_location.find(os.sep) >= 0:
         return os.path.basename(from_location.rstrip("/\\"))
     else: