/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Jelmer Vernooij
  • Date: 2011-11-15 17:27:46 UTC
  • mfrom: (6260 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6263.
  • Revision ID: jelmer@samba.org-20111115172746-bznns2ohiexp2g5q
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
118
118
        elif branch_path is not None:
119
119
            # standalone
120
120
            locs['branch root'] = branch_path
121
 
            if master_path != branch_path:
122
 
                locs['bound to branch'] = master_path
123
121
        elif repository is not None:
124
122
            locs['repository'] = repository.user_url
125
123
        elif control is not None:
128
126
            # Really, at least a control directory should be
129
127
            # passed in for this method to be useful.
130
128
            pass
 
129
        if master_path != branch_path:
 
130
            locs['bound to branch'] = master_path
131
131
    if repository is not None and repository.is_shared():
132
132
        # lightweight checkout of branch in shared repository
133
133
        locs['shared repository'] = repository.user_url
171
171
        outfile.writelines(locs.get_lines())
172
172
 
173
173
 
 
174
def _show_control_dir_info(control, outfile):
 
175
    """Show control dir information."""
 
176
    if control._format.colocated_branches:
 
177
        outfile.write('\n')
 
178
        outfile.write('Control directory:\n')
 
179
        outfile.write('         %d branches\n' % len(control.list_branches()))
 
180
 
 
181
 
174
182
def _show_format_info(control=None, repository=None, branch=None,
175
183
                      working=None, outfile=None):
176
184
    """Show known formats for control, working, branch and repository."""
392
400
        return
393
401
    _show_format_info(control, repository, branch, working, outfile)
394
402
    _show_locking_info(repository, branch, working, outfile)
 
403
    _show_control_dir_info(control, outfile)
395
404
    if branch is not None:
396
405
        _show_missing_revisions_branch(branch, outfile)
397
406
    if working is not None: