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

[Jelmer Vernooij]

Show colocated branch name in 'brz info'.

Show colocated branch name in 'brz info'.

[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/122/

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

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

[Jelmer Vernooij (jelmer)]

Flake8 failures.

On December 10, 2018 2:51:53 AM UTC, The Breezy Bot <email address hidden> wrote:
>Running landing tests failed
>https://ci.breezy-vcs.org/job/brz/job/brz-land/129/
>--
>https://code.launchpad.net/~jelmer/brz/info-colocated/+merge/359663
>You are the owner of lp:~jelmer/brz/info-colocated.

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

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

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

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

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

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

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

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

[lp:~jelmer/brz/info-colocated]

7214. By Jelmer Vernooij on 2018-12-15

Merge trunk.

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2018-11-19 20:11:08 +0000
+++ breezy/git/tests/test_blackbox.py	2018-12-11 00:00:51 +0000
@@ -63,7 +63,12 @@
         self.simple_commit()
         output, error = self.run_bzr(['info'])
         self.assertEqual(error, '')
-        self.assertTrue("Standalone tree (format: git)" in output)
+        self.assertEqual(
+            output,
+            'Standalone tree (format: git)\n'
+            'Location:\n'
+            '            light checkout root: .\n'
+            '  checkout of co-located branch: master\n')
 
     def test_ignore(self):
         self.simple_commit()

=== modified file 'breezy/info.py'
--- breezy/info.py	2018-11-12 01:41:38 +0000
+++ breezy/info.py	2018-12-11 00:00:51 +0000
@@ -108,7 +108,15 @@
             else:
                 locs['checkout root'] = branch_path
         if working_path != master_path:
-            locs['checkout of branch'] = master_path
+            (master_path_base, params) = urlutils.split_segment_parameters(
+                master_path)
+            if working_path == master_path_base:
+                locs['checkout of co-located branch'] = params['branch']
+            elif 'branch' in params:
+                locs['checkout of branch'] = "%s, branch %s" (
+                    master_path_base, params['branch'])
+            else:
+                locs['checkout of branch'] = master_path
         elif repository.is_shared():
             locs['repository branch'] = branch_path
         elif branch_path is not None:
@@ -138,9 +146,9 @@
         locs['shared repository'] = repository.user_url
     order = ['control directory', 'light checkout root',
              'repository checkout root', 'checkout root',
-             'checkout of branch', 'shared repository',
-             'repository', 'repository branch', 'branch root',
-             'bound to branch']
+             'checkout of branch', 'checkout of co-located branch',
+             'shared repository', 'repository', 'repository branch',
+             'branch root', 'bound to branch']
     return [(n, locs[n]) for n in order if n in locs]
 
 

=== modified file 'breezy/tests/blackbox/test_info.py'
--- breezy/tests/blackbox/test_info.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_info.py	2018-12-11 00:00:51 +0000
@@ -84,6 +84,18 @@
                          '  checkout of branch: target\n')
         self.assertEqual(err, '')
 
+    def test_info_colocated(self):
+        br = self.make_branch_and_tree('target', format='development-colo')
+        target = br.controldir.create_branch(name='dichtbij')
+        br.controldir.set_branch_reference(target)
+        out, err = self.run_bzr('info target')
+        self.assertEqual(out,
+                         'Standalone tree (format: development-colo)\n'
+                         'Location:\n'
+                         '            light checkout root: target\n'
+                         '  checkout of co-located branch: dichtbij\n')
+        self.assertEqual(err, '')
+
     def test_info_standalone(self):
         transport = self.get_transport()