← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

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
22
24
 
23
25
from bzrlib import (
24
26
    bzrdir,
 
27
    controldir,
25
28
    errors,
26
29
    hooks as _mod_hooks,
27
30
    osutils,
76
79
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
77
80
 
78
81
 
79
 
def gather_location_info(repository, branch=None, working=None):
 
82
def gather_location_info(repository=None, branch=None, working=None,
 
83
        control=None):
80
84
    locs = {}
81
 
    repository_path = repository.user_url
82
85
    if branch is not None:
83
86
        branch_path = branch.user_url
84
87
        master_path = branch.get_bound_location()
87
90
    else:
88
91
        branch_path = None
89
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
90
98
    if working:
91
99
        working_path = working.user_url
92
100
        if working_path != branch_path:
105
113
            locs['branch root'] = branch_path
106
114
    else:
107
115
        working_path = None
108
 
        if repository.is_shared():
 
116
        if repository is not None and repository.is_shared():
109
117
            # lightweight checkout of branch in shared repository
110
118
            if branch_path is not None:
111
119
                locs['repository branch'] = branch_path
112
120
        elif branch_path is not None:
113
121
            # standalone
114
122
            locs['branch root'] = branch_path
115
 
            if master_path != branch_path:
116
 
                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
117
127
        else:
118
 
            locs['repository'] = repository_path
119
 
    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():
120
134
        # lightweight checkout of branch in shared repository
121
 
        locs['shared repository'] = repository_path
122
 
    order = ['light checkout root', 'repository checkout root',
123
 
             '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',
124
139
             'repository', 'repository branch', 'branch root',
125
140
             'bound to branch']
126
141
    return [(n, locs[n]) for n in order if n in locs]
158
173
        outfile.writelines(locs.get_lines())
159
174
 
160
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
 
161
184
def _show_format_info(control=None, repository=None, branch=None,
162
185
                      working=None, outfile=None):
163
186
    """Show known formats for control, working, branch and repository."""
221
244
    """Show missing revisions in working tree."""
222
245
    branch = working.branch
223
246
    basis = working.basis_tree()
224
 
    branch_revno, branch_last_revision = branch.last_revision_info()
 
247
    try:
 
248
        branch_revno, branch_last_revision = branch.last_revision_info()
 
249
    except errors.UnsupportedOperation:
 
250
        return
225
251
    try:
226
252
        tree_last_id = working.get_parent_ids()[0]
227
253
    except IndexError:
268
294
 
269
295
def _show_branch_stats(branch, verbose, outfile):
270
296
    """Show statistics about a branch."""
271
 
    revno, head = branch.last_revision_info()
 
297
    try:
 
298
        revno, head = branch.last_revision_info()
 
299
    except errors.UnsupportedOperation:
 
300
        return {}
272
301
    outfile.write('\n')
273
302
    outfile.write('Branch history:\n')
274
303
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
320
349
    try:
321
350
        tree = a_bzrdir.open_workingtree(
322
351
            recommend_upgrade=False)
323
 
    except (NoWorkingTree, NotLocalUrl):
 
352
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
324
353
        tree = None
325
354
        try:
326
355
            branch = a_bzrdir.open_branch()
329
358
            try:
330
359
                repository = a_bzrdir.open_repository()
331
360
            except NoRepositoryPresent:
332
 
                # Return silently; cmd_info already returned NotBranchError
333
 
                # if no bzrdir could be opened.
334
 
                return
 
361
                lockable = None
 
362
                repository = None
335
363
            else:
336
364
                lockable = repository
337
365
        else:
342
370
        repository = branch.repository
343
371
        lockable = tree
344
372
 
345
 
    lockable.lock_read()
 
373
    if lockable is not None:
 
374
        lockable.lock_read()
346
375
    try:
347
376
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
348
377
                            outfile)
349
378
    finally:
350
 
        lockable.unlock()
 
379
        if lockable is not None:
 
380
            lockable.unlock()
351
381
 
352
382
 
353
383
def show_component_info(control, repository, branch=None, working=None,
359
389
        verbose = 1
360
390
    if verbose is True:
361
391
        verbose = 2
362
 
    layout = describe_layout(repository, branch, working)
 
392
    layout = describe_layout(repository, branch, working, control)
363
393
    format = describe_format(control, repository, branch, working)
364
394
    outfile.write("%s (format: %s)\n" % (layout, format))
365
 
    _show_location_info(gather_location_info(repository, branch, working),
366
 
                        outfile)
 
395
    _show_location_info(
 
396
        gather_location_info(control=control, repository=repository,
 
397
            branch=branch, working=working),
 
398
        outfile)
367
399
    if branch is not None:
368
400
        _show_related_info(branch, outfile)
369
401
    if verbose == 0:
370
402
        return
371
403
    _show_format_info(control, repository, branch, working, outfile)
372
404
    _show_locking_info(repository, branch, working, outfile)
 
405
    _show_control_dir_info(control, outfile)
373
406
    if branch is not None:
374
407
        _show_missing_revisions_branch(branch, outfile)
375
408
    if working is not None:
387
420
    _show_repository_stats(repository, stats, outfile)
388
421
 
389
422
 
390
 
def describe_layout(repository=None, branch=None, tree=None):
 
423
def describe_layout(repository=None, branch=None, tree=None, control=None):
391
424
    """Convert a control directory layout into a user-understandable term
392
425
 
393
426
    Common outputs include "Standalone tree", "Repository branch" and
394
427
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
395
428
    and "Empty control directory"
396
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"
397
438
    if repository is None:
398
439
        return 'Empty control directory'
399
440
    if branch is None and tree is None:
445
486
        branch.user_url != tree.user_url):
446
487
        branch = None
447
488
        repository = None
448
 
    non_aliases = set(bzrdir.format_registry.keys())
449
 
    non_aliases.difference_update(bzrdir.format_registry.aliases())
 
489
    non_aliases = set(controldir.format_registry.keys())
 
490
    non_aliases.difference_update(controldir.format_registry.aliases())
450
491
    for key in non_aliases:
451
 
        format = bzrdir.format_registry.make_bzrdir(key)
 
492
        format = controldir.format_registry.make_bzrdir(key)
452
493
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
453
494
            if (tree and format.workingtree_format !=
454
495
                tree._format):
466
507
        return 'unnamed'
467
508
    candidates.sort()
468
509
    new_candidates = [c for c in candidates if not
469
 
        bzrdir.format_registry.get_info(c).hidden]
 
510
        controldir.format_registry.get_info(c).hidden]
470
511
    if len(new_candidates) > 0:
471
512
        # If there are any non-hidden formats that match, only return those to
472
513
        # avoid listing hidden formats except when only a hidden format will