Merge lp:~jelmer/brz/flag-b into lp:brz/3.1

[Jelmer Vernooij]

Add a -b option to ''brz branch''.

Add a -b option to ''brz branch''.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2020-02-18 05:59:35 +0000
+++ breezy/builtins.py	2020-04-02 01:43:54 +0000
@@ -1470,15 +1470,17 @@
                             help="Bind new branch to from location."),
                      Option('no-recurse-nested',
                             help='Do not recursively check out nested trees.'),
+                     Option('colocated-branch', short_name='b',
+                            type=str, help='Name of colocated branch to sprout.'),
                      ]
 
     def run(self, from_location, to_location=None, revision=None,
             hardlink=False, stacked=False, standalone=False, no_tree=False,
             use_existing_dir=False, switch=False, bind=False,
-            files_from=None, no_recurse_nested=False):
+            files_from=None, no_recurse_nested=False, colocated_branch=None):
         from breezy import switch as _mod_switch
         accelerator_tree, br_from = controldir.ControlDir.open_tree_or_branch(
-            from_location)
+            from_location, name=colocated_branch)
         if no_recurse_nested:
             recurse = 'none'
         else:

=== modified file 'breezy/controldir.py'
--- breezy/controldir.py	2020-03-22 19:12:43 +0000
+++ breezy/controldir.py	2020-04-02 01:43:54 +0000
@@ -808,7 +808,7 @@
             a_transport = new_t
 
     @classmethod
-    def open_tree_or_branch(klass, location):
+    def open_tree_or_branch(klass, location, name=None):
         """Return the branch and working tree at a location.
 
         If there is no tree at the location, tree will be None.
@@ -817,7 +817,7 @@
         :return: (tree, branch)
         """
         controldir = klass.open(location)
-        return controldir._get_tree_branch()
+        return controldir._get_tree_branch(name=name)
 
     @classmethod
     def open_containing_tree_or_branch(klass, location,

=== modified file 'breezy/tests/blackbox/test_branch.py'
--- breezy/tests/blackbox/test_branch.py	2020-01-19 14:49:03 +0000
+++ breezy/tests/blackbox/test_branch.py	2020-04-02 01:43:54 +0000
@@ -107,6 +107,17 @@
         self.assertEqual('Branched 0 revisions.\n', err)
         self.assertPathExists('a')
 
+    def test_from_name(self):
+        """Branch from a colocated branch into a regular branch."""
+        os.mkdir('b')
+        tree = self.example_branch('b/a', format='development-colo')
+        tree.controldir.create_branch(name='somecolo')
+        out, err = self.run_bzr('branch -b somecolo %s' %
+                                local_path_to_url('b/a'))
+        self.assertEqual('', out)
+        self.assertEqual('Branched 0 revisions.\n', err)
+        self.assertPathExists('a')
+
     def test_branch_broken_pack(self):
         """branching with a corrupted pack file."""
         self.example_branch('a')

=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2020-01-19 03:22:04 +0000
+++ breezy/tests/test_bzrdir.py	2020-04-02 01:43:54 +0000
@@ -821,6 +821,20 @@
         self.assertEqual(os.path.realpath('topdir/foo'),
                          self.local_branch_path(branch))
 
+    def test_open_tree_or_branch_named(self):
+        tree = self.make_branch_and_tree('topdir')
+        self.assertRaises(
+            NotBranchError,
+            bzrdir.BzrDir.open_tree_or_branch, 'topdir', name='missing')
+        tree.branch.controldir.create_branch('named')
+        tree, branch = bzrdir.BzrDir.open_tree_or_branch('topdir', name='named')
+        self.assertEqual(os.path.realpath('topdir'),
+                         os.path.realpath(tree.basedir))
+        self.assertEqual(os.path.realpath('topdir'),
+                         self.local_branch_path(branch))
+        self.assertEqual(branch.name, 'named')
+        self.assertIs(tree.controldir, branch.controldir)
+
     def test_open_from_transport(self):
         # transport pointing at bzrdir should give a bzrdir with root transport
         # set to the given transport

=== modified file 'doc/en/release-notes/brz-3.1.txt'
--- doc/en/release-notes/brz-3.1.txt	2020-03-28 22:25:33 +0000
+++ doc/en/release-notes/brz-3.1.txt	2020-04-02 01:43:54 +0000
@@ -80,6 +80,10 @@
  * ``brz sprout`` is now an alias for ``brz branch``.
    (Jelmer Vernooij)
 
+ * ``brz branch`` now accepts a ``-b`` flag with the
+   name of the colocated branch to sprout.
+   (Jelmer Vernooij, #1869977)
+
 Improvements
 ************