← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Martin Pool
  • Date: 2010-06-02 05:03:31 UTC
  • mto: This revision was merged to the branch mainline in revision 5279.
  • Revision ID: mbp@canonical.com-20100602050331-n2p1qt8hfsahspnv
Correct more sloppy use of the term 'Linux'

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
 
 
19
17
__all__ = ['show_bzrdir_info']
20
18
 
21
19
from cStringIO import StringIO
24
22
 
25
23
from bzrlib import (
26
24
    bzrdir,
27
 
    controldir,
28
25
    errors,
29
26
    hooks as _mod_hooks,
30
27
    osutils,
79
76
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
80
77
 
81
78
 
82
 
def gather_location_info(repository=None, branch=None, working=None,
83
 
        control=None):
 
79
def gather_location_info(repository, branch=None, working=None):
84
80
    locs = {}
 
81
    repository_path = repository.user_url
85
82
    if branch is not None:
86
83
        branch_path = branch.user_url
87
84
        master_path = branch.get_bound_location()
90
87
    else:
91
88
        branch_path = None
92
89
        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
98
90
    if working:
99
91
        working_path = working.user_url
100
92
        if working_path != branch_path:
113
105
            locs['branch root'] = branch_path
114
106
    else:
115
107
        working_path = None
116
 
        if repository is not None and repository.is_shared():
 
108
        if repository.is_shared():
117
109
            # lightweight checkout of branch in shared repository
118
110
            if branch_path is not None:
119
111
                locs['repository branch'] = branch_path
120
112
        elif branch_path is not None:
121
113
            # standalone
122
114
            locs['branch root'] = branch_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
 
115
            if master_path != branch_path:
 
116
                locs['bound to branch'] = master_path
127
117
        else:
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():
 
118
            locs['repository'] = repository_path
 
119
    if repository.is_shared():
134
120
        # lightweight checkout of branch in 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',
 
121
        locs['shared repository'] = repository_path
 
122
    order = ['light checkout root', 'repository checkout root',
 
123
             'checkout root', 'checkout of branch', 'shared repository',
139
124
             'repository', 'repository branch', 'branch root',
140
125
             'bound to branch']
141
126
    return [(n, locs[n]) for n in order if n in locs]
173
158
        outfile.writelines(locs.get_lines())
174
159
 
175
160
 
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
 
 
184
161
def _show_format_info(control=None, repository=None, branch=None,
185
162
                      working=None, outfile=None):
186
163
    """Show known formats for control, working, branch and repository."""
244
221
    """Show missing revisions in working tree."""
245
222
    branch = working.branch
246
223
    basis = working.basis_tree()
247
 
    try:
248
 
        branch_revno, branch_last_revision = branch.last_revision_info()
249
 
    except errors.UnsupportedOperation:
250
 
        return
 
224
    work_inv = working.inventory
 
225
    branch_revno, branch_last_revision = branch.last_revision_info()
251
226
    try:
252
227
        tree_last_id = working.get_parent_ids()[0]
253
228
    except IndexError:
264
239
def _show_working_stats(working, outfile):
265
240
    """Show statistics about a working tree."""
266
241
    basis = working.basis_tree()
 
242
    work_inv = working.inventory
267
243
    delta = working.changes_from(basis, want_unchanged=True)
268
244
 
269
245
    outfile.write('\n')
284
260
    outfile.write('  %8d ignored\n' % ignore_cnt)
285
261
 
286
262
    dir_cnt = 0
287
 
    root_id = working.get_root_id()
288
 
    for path, entry in working.iter_entries_by_dir():
289
 
        if entry.kind == 'directory' and entry.file_id != root_id:
 
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)):
290
266
            dir_cnt += 1
291
267
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
292
268
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
294
270
 
295
271
def _show_branch_stats(branch, verbose, outfile):
296
272
    """Show statistics about a branch."""
297
 
    try:
298
 
        revno, head = branch.last_revision_info()
299
 
    except errors.UnsupportedOperation:
300
 
        return {}
 
273
    revno, head = branch.last_revision_info()
301
274
    outfile.write('\n')
302
275
    outfile.write('Branch history:\n')
303
276
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
349
322
    try:
350
323
        tree = a_bzrdir.open_workingtree(
351
324
            recommend_upgrade=False)
352
 
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
 
325
    except (NoWorkingTree, NotLocalUrl):
353
326
        tree = None
354
327
        try:
355
328
            branch = a_bzrdir.open_branch()
358
331
            try:
359
332
                repository = a_bzrdir.open_repository()
360
333
            except NoRepositoryPresent:
361
 
                lockable = None
362
 
                repository = None
 
334
                # Return silently; cmd_info already returned NotBranchError
 
335
                # if no bzrdir could be opened.
 
336
                return
363
337
            else:
364
338
                lockable = repository
365
339
        else:
370
344
        repository = branch.repository
371
345
        lockable = tree
372
346
 
373
 
    if lockable is not None:
374
 
        lockable.lock_read()
 
347
    lockable.lock_read()
375
348
    try:
376
349
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
377
350
                            outfile)
378
351
    finally:
379
 
        if lockable is not None:
380
 
            lockable.unlock()
 
352
        lockable.unlock()
381
353
 
382
354
 
383
355
def show_component_info(control, repository, branch=None, working=None,
389
361
        verbose = 1
390
362
    if verbose is True:
391
363
        verbose = 2
392
 
    layout = describe_layout(repository, branch, working, control)
 
364
    layout = describe_layout(repository, branch, working)
393
365
    format = describe_format(control, repository, branch, working)
394
366
    outfile.write("%s (format: %s)\n" % (layout, format))
395
 
    _show_location_info(
396
 
        gather_location_info(control=control, repository=repository,
397
 
            branch=branch, working=working),
398
 
        outfile)
 
367
    _show_location_info(gather_location_info(repository, branch, working),
 
368
                        outfile)
399
369
    if branch is not None:
400
370
        _show_related_info(branch, outfile)
401
371
    if verbose == 0:
402
372
        return
403
373
    _show_format_info(control, repository, branch, working, outfile)
404
374
    _show_locking_info(repository, branch, working, outfile)
405
 
    _show_control_dir_info(control, outfile)
406
375
    if branch is not None:
407
376
        _show_missing_revisions_branch(branch, outfile)
408
377
    if working is not None:
420
389
    _show_repository_stats(repository, stats, outfile)
421
390
 
422
391
 
423
 
def describe_layout(repository=None, branch=None, tree=None, control=None):
 
392
def describe_layout(repository=None, branch=None, tree=None):
424
393
    """Convert a control directory layout into a user-understandable term
425
394
 
426
395
    Common outputs include "Standalone tree", "Repository branch" and
427
396
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
428
397
    and "Empty control directory"
429
398
    """
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"
438
399
    if repository is None:
439
400
        return 'Empty control directory'
440
401
    if branch is None and tree is None:
486
447
        branch.user_url != tree.user_url):
487
448
        branch = None
488
449
        repository = None
489
 
    non_aliases = set(controldir.format_registry.keys())
490
 
    non_aliases.difference_update(controldir.format_registry.aliases())
 
450
    non_aliases = set(bzrdir.format_registry.keys())
 
451
    non_aliases.difference_update(bzrdir.format_registry.aliases())
491
452
    for key in non_aliases:
492
 
        format = controldir.format_registry.make_bzrdir(key)
 
453
        format = bzrdir.format_registry.make_bzrdir(key)
493
454
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
494
455
            if (tree and format.workingtree_format !=
495
456
                tree._format):
507
468
        return 'unnamed'
508
469
    candidates.sort()
509
470
    new_candidates = [c for c in candidates if not
510
 
        controldir.format_registry.get_info(c).hidden]
 
471
        bzrdir.format_registry.get_info(c).hidden]
511
472
    if len(new_candidates) > 0:
512
473
        # If there are any non-hidden formats that match, only return those to
513
474
        # avoid listing hidden formats except when only a hidden format will
520
481
    """Hooks for the info command."""
521
482
 
522
483
    def __init__(self):
523
 
        super(InfoHooks, self).__init__("bzrlib.info", "hooks")
524
 
        self.add_hook('repository',
 
484
        super(InfoHooks, self).__init__()
 
485
        self.create_hook(_mod_hooks.HookPoint('repository',
525
486
            "Invoked when displaying the statistics for a repository. "
526
487
            "repository is called with a statistics dictionary as returned "
527
 
            "by the repository and a file-like object to write to.", (1, 15))
 
488
            "by the repository and a file-like object to write to.", (1, 15), 
 
489
            None))
528
490
 
529
491
 
530
492
hooks = InfoHooks()