Merge lp:~jelmer/bzr/info-shows-colocated-branches into lp:bzr

[Jelmer Vernooij]

Print the number of colocated branches in 'bzr info'.

Show the number of colocated branches in 'bzr info -v'.

[Vincent Ladeuil (vila)]

12 + outfile.write('Control directory:\n')
13 + outfile.write(' %d branches\n' % len(control.list_branches()))

Urgh, what a weird indendation ! Even lp removed the spaces before '%d' when I pasted the line above...

Yeah, I realise this is *required* to align with the 'Branch history' and 'Repository' lines, just wanted to let you know I share the feeling (if not with you, at least with lp ;)

Yet, Riddell showed us how to handle plural form for the above, care to fix that ?

Ha crap, nothing in the command have been localized yet, forget about that :-/

Do we really want to mention 'Control directory' to our users ? I'm +1 for adding the _show_control_dir_info() so we have a single place for everything related to the control dir that is not already covered by the other functions, but I'm less convinced that we should tell our users about it...

I don't have a good alternative to propose so I won't block on it though.

review: Approve

[Jelmer Vernooij (jelmer)]

Thanks for the review. :-)

> 12 + outfile.write('Control directory:\n')
> 13 + outfile.write(' %d branches\n' % len(control.list_branches()))
>
> Do we really want to mention 'Control directory' to our users ? I'm +1 for
> adding the _show_control_dir_info() so we have a single place for everything
> related to the control dir that is not already covered by the other functions,
> but I'm less convinced that we should tell our users about it...
>
> I don't have a good alternative to propose so I won't block on it though.
We only print this if there is a bare control directory present, without a repository, branch or working tree. I think we should tell the user *something* in this case - previously we were not outputting anything at all.

Cheers,

Jelmer

[Jelmer Vernooij (jelmer)]

> Thanks for the review. :-)
>
> > 12 + outfile.write('Control directory:\n')
> > 13 + outfile.write(' %d branches\n' % len(control.list_branches()))
> >
> > Do we really want to mention 'Control directory' to our users ? I'm +1 for
> > adding the _show_control_dir_info() so we have a single place for everything
> > related to the control dir that is not already covered by the other
> functions,
> > but I'm less convinced that we should tell our users about it...
> >
> > I don't have a good alternative to propose so I won't block on it though.
> We only print this if there is a bare control directory present, without a
> repository, branch or working tree. I think we should tell the user
> *something* in this case - previously we were not outputting anything at all.
Scratch that, wrong MP! Sorry.

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/info.py'
--- bzrlib/info.py	2011-10-11 12:01:51 +0000
+++ bzrlib/info.py	2011-11-07 10:50:28 +0000
@@ -159,6 +159,14 @@
         outfile.writelines(locs.get_lines())
 
 
+def _show_control_dir_info(control, outfile):
+    """Show control dir information."""
+    if control._format.colocated_branches:
+        outfile.write('\n')
+        outfile.write('Control directory:\n')
+        outfile.write('         %d branches\n' % len(control.list_branches()))
+
+
 def _show_format_info(control=None, repository=None, branch=None,
                       working=None, outfile=None):
     """Show known formats for control, working, branch and repository."""
@@ -377,6 +385,7 @@
         return
     _show_format_info(control, repository, branch, working, outfile)
     _show_locking_info(repository, branch, working, outfile)
+    _show_control_dir_info(control, outfile)
     if branch is not None:
         _show_missing_revisions_branch(branch, outfile)
     if working is not None:

=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- bzrlib/tests/blackbox/test_info.py	2011-10-14 13:56:45 +0000
+++ bzrlib/tests/blackbox/test_info.py	2011-11-07 10:50:28 +0000
@@ -1376,3 +1376,30 @@
          0 versioned subdirectories
 """, out)
         self.assertEqual("", err)
+
+    def test_info_shows_colocated_branches(self):
+        bzrdir = self.make_branch('.', format='development-colo').bzrdir
+        bzrdir.create_branch(name="colo1")
+        bzrdir.create_branch(name="colo2")
+        bzrdir.create_branch(name="colo3")
+        out, err = self.run_bzr('info -v .')
+        self.assertEqualDiff(
+"""Standalone branch (format: development-colo)
+Location:
+  branch root: .
+
+Format:
+       control: Meta directory format 1 with support for colocated branches
+        branch: Branch format 7
+    repository: Repository format 2a - rich roots, group compression and chk inventories
+
+Control directory:
+         4 branches
+
+Branch history:
+         0 revisions
+
+Repository:
+         0 revisions
+""", out)
+        self.assertEqual("", err)

=== modified file 'doc/en/release-notes/bzr-2.5.txt'
--- doc/en/release-notes/bzr-2.5.txt	2011-11-01 23:06:12 +0000
+++ doc/en/release-notes/bzr-2.5.txt	2011-11-07 10:50:28 +0000
@@ -31,6 +31,10 @@
 .. Improvements to existing commands, especially improved performance 
    or memory usage, or better results.
 
+* ``bzr info -v`` now shows the number of colocated branches
+  for control directories that support them.
+  (Jelmer Vernooij, #863285)
+
 * ``bzr version-info`` now takes a ``--revision`` argument.
   (Jelmer Vernooij, #238705)