← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Patch Queue Manager
  • Date: 2011-10-14 16:54:26 UTC
  • mfrom: (6216.1.1 remove-this-file)
  • Revision ID: pqm@pqm.ubuntu.com-20111014165426-tjix4e6idryf1r2z
(jelmer) Remove an accidentally committed .THIS file. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
22
22
 
23
23
from bzrlib import (
24
24
    bzrdir,
 
25
    controldir,
25
26
    errors,
26
27
    hooks as _mod_hooks,
27
28
    osutils,
221
222
    """Show missing revisions in working tree."""
222
223
    branch = working.branch
223
224
    basis = working.basis_tree()
224
 
    work_inv = working.inventory
225
 
    branch_revno, branch_last_revision = branch.last_revision_info()
 
225
    try:
 
226
        branch_revno, branch_last_revision = branch.last_revision_info()
 
227
    except errors.UnsupportedOperation:
 
228
        return
226
229
    try:
227
230
        tree_last_id = working.get_parent_ids()[0]
228
231
    except IndexError:
239
242
def _show_working_stats(working, outfile):
240
243
    """Show statistics about a working tree."""
241
244
    basis = working.basis_tree()
242
 
    work_inv = working.inventory
243
245
    delta = working.changes_from(basis, want_unchanged=True)
244
246
 
245
247
    outfile.write('\n')
260
262
    outfile.write('  %8d ignored\n' % ignore_cnt)
261
263
 
262
264
    dir_cnt = 0
263
 
    for file_id in work_inv:
264
 
        if (work_inv.get_file_kind(file_id) == 'directory' and
265
 
            not work_inv.is_root(file_id)):
 
265
    root_id = working.get_root_id()
 
266
    for path, entry in working.iter_entries_by_dir():
 
267
        if entry.kind == 'directory' and entry.file_id != root_id:
266
268
            dir_cnt += 1
267
269
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
268
270
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
270
272
 
271
273
def _show_branch_stats(branch, verbose, outfile):
272
274
    """Show statistics about a branch."""
273
 
    revno, head = branch.last_revision_info()
 
275
    try:
 
276
        revno, head = branch.last_revision_info()
 
277
    except errors.UnsupportedOperation:
 
278
        return {}
274
279
    outfile.write('\n')
275
280
    outfile.write('Branch history:\n')
276
281
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
332
337
                repository = a_bzrdir.open_repository()
333
338
            except NoRepositoryPresent:
334
339
                # Return silently; cmd_info already returned NotBranchError
335
 
                # if no bzrdir could be opened.
 
340
                # if no controldir could be opened.
336
341
                return
337
342
            else:
338
343
                lockable = repository
447
452
        branch.user_url != tree.user_url):
448
453
        branch = None
449
454
        repository = None
450
 
    non_aliases = set(bzrdir.format_registry.keys())
451
 
    non_aliases.difference_update(bzrdir.format_registry.aliases())
 
455
    non_aliases = set(controldir.format_registry.keys())
 
456
    non_aliases.difference_update(controldir.format_registry.aliases())
452
457
    for key in non_aliases:
453
 
        format = bzrdir.format_registry.make_bzrdir(key)
 
458
        format = controldir.format_registry.make_bzrdir(key)
454
459
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
455
460
            if (tree and format.workingtree_format !=
456
461
                tree._format):
468
473
        return 'unnamed'
469
474
    candidates.sort()
470
475
    new_candidates = [c for c in candidates if not
471
 
        bzrdir.format_registry.get_info(c).hidden]
 
476
        controldir.format_registry.get_info(c).hidden]
472
477
    if len(new_candidates) > 0:
473
478
        # If there are any non-hidden formats that match, only return those to
474
479
        # avoid listing hidden formats except when only a hidden format will
481
486
    """Hooks for the info command."""
482
487
 
483
488
    def __init__(self):
484
 
        super(InfoHooks, self).__init__()
485
 
        self.create_hook(_mod_hooks.HookPoint('repository',
 
489
        super(InfoHooks, self).__init__("bzrlib.info", "hooks")
 
490
        self.add_hook('repository',
486
491
            "Invoked when displaying the statistics for a repository. "
487
492
            "repository is called with a statistics dictionary as returned "
488
 
            "by the repository and a file-like object to write to.", (1, 15), 
489
 
            None))
 
493
            "by the repository and a file-like object to write to.", (1, 15))
490
494
 
491
495
 
492
496
hooks = InfoHooks()