← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-18 16:55:04 UTC
  • mfrom: (6437.23.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6469.
  • Revision ID: jelmer@samba.org-20120218165504-c9oe5c5ue805y8wp
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
__all__ = ['show_bzrdir_info']
18
20
 
19
21
from cStringIO import StringIO
77
79
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
78
80
 
79
81
 
80
 
def gather_location_info(repository, branch=None, working=None):
 
82
def gather_location_info(repository=None, branch=None, working=None,
 
83
        control=None):
81
84
    locs = {}
82
 
    repository_path = repository.user_url
83
85
    if branch is not None:
84
86
        branch_path = branch.user_url
85
87
        master_path = branch.get_bound_location()
88
90
    else:
89
91
        branch_path = None
90
92
        master_path = None
 
93
        try:
 
94
            if control is not None and control.get_branch_reference():
 
95
                locs['checkout of branch'] = control.get_branch_reference()
 
96
        except NotBranchError:
 
97
            pass
91
98
    if working:
92
99
        working_path = working.user_url
93
100
        if working_path != branch_path:
106
113
            locs['branch root'] = branch_path
107
114
    else:
108
115
        working_path = None
109
 
        if repository.is_shared():
 
116
        if repository is not None and repository.is_shared():
110
117
            # lightweight checkout of branch in shared repository
111
118
            if branch_path is not None:
112
119
                locs['repository branch'] = branch_path
113
120
        elif branch_path is not None:
114
121
            # standalone
115
122
            locs['branch root'] = branch_path
116
 
            if master_path != branch_path:
117
 
                locs['bound to branch'] = master_path
 
123
        elif repository is not None:
 
124
            locs['repository'] = repository.user_url
 
125
        elif control is not None:
 
126
            locs['control directory'] = control.user_url
118
127
        else:
119
 
            locs['repository'] = repository_path
120
 
    if repository.is_shared():
 
128
            # Really, at least a control directory should be
 
129
            # passed in for this method to be useful.
 
130
            pass
 
131
        if master_path != branch_path:
 
132
            locs['bound to branch'] = master_path
 
133
    if repository is not None and repository.is_shared():
121
134
        # lightweight checkout of branch in shared repository
122
 
        locs['shared repository'] = repository_path
123
 
    order = ['light checkout root', 'repository checkout root',
124
 
             'checkout root', 'checkout of branch', 'shared repository',
 
135
        locs['shared repository'] = repository.user_url
 
136
    order = ['control directory', 'light checkout root',
 
137
             'repository checkout root', 'checkout root',
 
138
             'checkout of branch', 'shared repository',
125
139
             'repository', 'repository branch', 'branch root',
126
140
             'bound to branch']
127
141
    return [(n, locs[n]) for n in order if n in locs]
159
173
        outfile.writelines(locs.get_lines())
160
174
 
161
175
 
 
176
def _show_control_dir_info(control, outfile):
 
177
    """Show control dir information."""
 
178
    if control._format.colocated_branches:
 
179
        outfile.write('\n')
 
180
        outfile.write('Control directory:\n')
 
181
        outfile.write('         %d branches\n' % len(control.list_branches()))
 
182
 
 
183
 
162
184
def _show_format_info(control=None, repository=None, branch=None,
163
185
                      working=None, outfile=None):
164
186
    """Show known formats for control, working, branch and repository."""
327
349
    try:
328
350
        tree = a_bzrdir.open_workingtree(
329
351
            recommend_upgrade=False)
330
 
    except (NoWorkingTree, NotLocalUrl):
 
352
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
331
353
        tree = None
332
354
        try:
333
 
            branch = a_bzrdir.open_branch()
 
355
            branch = a_bzrdir.open_branch(name="")
334
356
        except NotBranchError:
335
357
            branch = None
336
358
            try:
337
359
                repository = a_bzrdir.open_repository()
338
360
            except NoRepositoryPresent:
339
 
                # Return silently; cmd_info already returned NotBranchError
340
 
                # if no controldir could be opened.
341
 
                return
 
361
                lockable = None
 
362
                repository = None
342
363
            else:
343
364
                lockable = repository
344
365
        else:
349
370
        repository = branch.repository
350
371
        lockable = tree
351
372
 
352
 
    lockable.lock_read()
 
373
    if lockable is not None:
 
374
        lockable.lock_read()
353
375
    try:
354
376
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
355
377
                            outfile)
356
378
    finally:
357
 
        lockable.unlock()
 
379
        if lockable is not None:
 
380
            lockable.unlock()
358
381
 
359
382
 
360
383
def show_component_info(control, repository, branch=None, working=None,
366
389
        verbose = 1
367
390
    if verbose is True:
368
391
        verbose = 2
369
 
    layout = describe_layout(repository, branch, working)
 
392
    layout = describe_layout(repository, branch, working, control)
370
393
    format = describe_format(control, repository, branch, working)
371
394
    outfile.write("%s (format: %s)\n" % (layout, format))
372
 
    _show_location_info(gather_location_info(repository, branch, working),
373
 
                        outfile)
 
395
    _show_location_info(
 
396
        gather_location_info(control=control, repository=repository,
 
397
            branch=branch, working=working),
 
398
        outfile)
374
399
    if branch is not None:
375
400
        _show_related_info(branch, outfile)
376
401
    if verbose == 0:
377
402
        return
378
403
    _show_format_info(control, repository, branch, working, outfile)
379
404
    _show_locking_info(repository, branch, working, outfile)
 
405
    _show_control_dir_info(control, outfile)
380
406
    if branch is not None:
381
407
        _show_missing_revisions_branch(branch, outfile)
382
408
    if working is not None:
394
420
    _show_repository_stats(repository, stats, outfile)
395
421
 
396
422
 
397
 
def describe_layout(repository=None, branch=None, tree=None):
 
423
def describe_layout(repository=None, branch=None, tree=None, control=None):
398
424
    """Convert a control directory layout into a user-understandable term
399
425
 
400
426
    Common outputs include "Standalone tree", "Repository branch" and
401
427
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
402
428
    and "Empty control directory"
403
429
    """
 
430
    if branch is None and control is not None:
 
431
        try:
 
432
            branch_reference = control.get_branch_reference()
 
433
        except NotBranchError:
 
434
            pass
 
435
        else:
 
436
            if branch_reference is not None:
 
437
                return "Dangling branch reference"
404
438
    if repository is None:
405
439
        return 'Empty control directory'
406
440
    if branch is None and tree is None:
408
442
            phrase = 'Shared repository'
409
443
        else:
410
444
            phrase = 'Unshared repository'
 
445
        extra = []
411
446
        if repository.make_working_trees():
412
 
            phrase += ' with trees'
 
447
            extra.append('trees')
 
448
        if len(control.get_branches()) > 0:
 
449
            extra.append('colocated branches')
 
450
        if extra:
 
451
            phrase += ' with ' + " and ".join(extra)
413
452
        return phrase
414
453
    else:
415
454
        if repository.is_shared():