Merge lp:~jelmer/bzr/info-shows-colocated-branches into lp:bzr
Proposed by
Jelmer Vernooij
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Vincent Ladeuil | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 6246 | ||||
Proposed branch: | lp:~jelmer/bzr/info-shows-colocated-branches | ||||
Merge into: | lp:bzr | ||||
Diff against target: |
75 lines (+40/-0) 3 files modified
bzrlib/info.py (+9/-0) bzrlib/tests/blackbox/test_info.py (+27/-0) doc/en/release-notes/bzr-2.5.txt (+4/-0) |
||||
To merge this branch: | bzr merge lp:~jelmer/bzr/info-shows-colocated-branches | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+81438@code.launchpad.net |
Commit message
Print the number of colocated branches in 'bzr info'.
Description of the change
Show the number of colocated branches in 'bzr info -v'.
To post a comment you must log in.
12 + outfile. write(' Control directory:\n') list_branches( )))
13 + outfile.write(' %d branches\n' % len(control.
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.