Merge lp:~jelmer/brz/switch-colocated into lp:brz

[Jelmer Vernooij]

Display colocated branch name when switching between branches.

Display colocated branch name when switching between branches.

[Martin Packman (gz)]

Looks good, thanks.

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/151/

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/154/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-12-10 05:22:17 +0000
+++ breezy/builtins.py	2018-12-21 23:50:32 +0000
@@ -6364,8 +6364,15 @@
         if had_explicit_nick:
             branch = control_dir.open_branch()  # get the new branch!
             branch.nick = to_branch.nick
-        note(gettext('Switched to branch: %s'),
-             urlutils.unescape_for_display(to_branch.base, 'utf-8'))
+        if to_branch.name:
+            if to_branch.controldir.control_url != control_dir.control_url:
+                note(gettext('Switched to branch %s at %s'),
+                     to_branch.name, urlutils.unescape_for_display(to_branch.base, 'utf-8'))
+            else:
+                note(gettext('Switched to branch %s'), to_branch.name)
+        else:
+            note(gettext('Switched to branch at %s'),
+                 urlutils.unescape_for_display(to_branch.base, 'utf-8'))
 
 
 class cmd_view(Command):
 
=== modified file 'breezy/tests/blackbox/test_switch.py'
--- breezy/tests/blackbox/test_switch.py	2018-11-16 23:28:26 +0000
+++ breezy/tests/blackbox/test_switch.py	2018-12-21 23:50:32 +0000
@@ -55,7 +55,7 @@
         os.chdir('checkout')
         out, err = self.run_bzr('switch ../branch2')
         self.assertContainsRe(err, 'Tree is up to date at revision 0.\n')
-        self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
+        self.assertContainsRe(err, 'Switched to branch at .*/branch2.\n')
         self.assertEqual('', out)
 
     def test_switch_out_of_date_light_checkout(self):
@@ -69,7 +69,7 @@
         out, err = self.run_bzr('switch ../branch2')
         #self.assertContainsRe(err, '\+N  file')
         self.assertContainsRe(err, 'Updated to revision 1.\n')
-        self.assertContainsRe(err, 'Switched to branch: .*/branch2.\n')
+        self.assertContainsRe(err, 'Switched to branch at .*/branch2.\n')
         self.assertEqual('', out)
 
     def _test_switch_nick(self, lightweight):
@@ -431,7 +431,7 @@
                 $ cd checkout
                 $ brz switch --create-branch switched
                 2>Tree is up to date at revision 0.
-                2>Switched to branch:...switched...
+                2>Switched to branch at .../switched/
                 $ cd ..
                 ''' % locals())
         bound_branch = branch.Branch.open_containing('checkout')[0]
@@ -590,7 +590,7 @@
            Created a standalone tree (format: 2a)
            $ brz switch -b trunk
            2>Tree is up to date at revision 0.
-           2>Switched to branch:...
+           2>Switched to branch trunk
            $ brz commit -m 1 --unchanged
            2>Committing to: ...
            2>Committed revision 1.
@@ -599,7 +599,7 @@
            2>Committed revision 2.
            $ brz switch -b blah -r1
            2>Updated to revision 1.
-           2>Switched to branch:...
+           2>Switched to branch blah
            $ brz branches
            * blah
              trunk