← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: John Arbash Meinel
  • Date: 2010-02-17 17:11:16 UTC
  • mfrom: (4797.2.17 2.1)
  • mto: (4797.2.18 2.1)
  • mto: This revision was merged to the branch mainline in revision 5055.
  • Revision ID: john@arbash-meinel.com-20100217171116-h7t9223ystbnx5h8
merge bzr.2.1 in preparation for NEWS entry.

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
 
20
import os
22
21
import time
23
22
import sys
24
23
 
25
24
from bzrlib import (
26
25
    bzrdir,
27
 
    controldir,
 
26
    diff,
28
27
    errors,
29
28
    hooks as _mod_hooks,
30
29
    osutils,
79
78
        return ["  %*s: %s\n" % (max_len, l, u) for l, u in self.locs ]
80
79
 
81
80
 
82
 
def gather_location_info(repository=None, branch=None, working=None,
83
 
        control=None):
 
81
def gather_location_info(repository, branch=None, working=None):
84
82
    locs = {}
 
83
    repository_path = repository.bzrdir.root_transport.base
85
84
    if branch is not None:
86
 
        branch_path = branch.user_url
 
85
        branch_path = branch.bzrdir.root_transport.base
87
86
        master_path = branch.get_bound_location()
88
87
        if master_path is None:
89
88
            master_path = branch_path
90
89
    else:
91
90
        branch_path = None
92
91
        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
92
    if working:
99
 
        working_path = working.user_url
 
93
        working_path = working.bzrdir.root_transport.base
100
94
        if working_path != branch_path:
101
95
            locs['light checkout root'] = working_path
102
96
        if master_path != branch_path:
113
107
            locs['branch root'] = branch_path
114
108
    else:
115
109
        working_path = None
116
 
        if repository is not None and repository.is_shared():
 
110
        if repository.is_shared():
117
111
            # lightweight checkout of branch in shared repository
118
112
            if branch_path is not None:
119
113
                locs['repository branch'] = branch_path
120
114
        elif branch_path is not None:
121
115
            # standalone
122
116
            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
 
117
            if master_path != branch_path:
 
118
                locs['bound to branch'] = master_path
127
119
        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():
 
120
            locs['repository'] = repository_path
 
121
    if repository.is_shared():
134
122
        # 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',
 
123
        locs['shared repository'] = repository_path
 
124
    order = ['light checkout root', 'repository checkout root',
 
125
             'checkout root', 'checkout of branch', 'shared repository',
139
126
             'repository', 'repository branch', 'branch root',
140
127
             'bound to branch']
141
128
    return [(n, locs[n]) for n in order if n in locs]
173
160
        outfile.writelines(locs.get_lines())
174
161
 
175
162
 
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
163
def _show_format_info(control=None, repository=None, branch=None,
185
164
                      working=None, outfile=None):
186
165
    """Show known formats for control, working, branch and repository."""
200
179
            repository._format.get_format_description())
201
180
 
202
181
 
203
 
def _show_locking_info(repository=None, branch=None, working=None,
204
 
        outfile=None):
 
182
def _show_locking_info(repository, branch=None, working=None, outfile=None):
205
183
    """Show locking status of working, branch and repository."""
206
 
    if (repository and repository.get_physical_lock_status() or
 
184
    if (repository.get_physical_lock_status() or
207
185
        (branch and branch.get_physical_lock_status()) or
208
186
        (working and working.get_physical_lock_status())):
209
187
        outfile.write('\n')
245
223
    """Show missing revisions in working tree."""
246
224
    branch = working.branch
247
225
    basis = working.basis_tree()
248
 
    try:
249
 
        branch_revno, branch_last_revision = branch.last_revision_info()
250
 
    except errors.UnsupportedOperation:
251
 
        return
 
226
    work_inv = working.inventory
 
227
    branch_revno, branch_last_revision = branch.last_revision_info()
252
228
    try:
253
229
        tree_last_id = working.get_parent_ids()[0]
254
230
    except IndexError:
265
241
def _show_working_stats(working, outfile):
266
242
    """Show statistics about a working tree."""
267
243
    basis = working.basis_tree()
 
244
    work_inv = working.inventory
268
245
    delta = working.changes_from(basis, want_unchanged=True)
269
246
 
270
247
    outfile.write('\n')
285
262
    outfile.write('  %8d ignored\n' % ignore_cnt)
286
263
 
287
264
    dir_cnt = 0
288
 
    root_id = working.get_root_id()
289
 
    for path, entry in working.iter_entries_by_dir():
290
 
        if entry.kind == 'directory' and entry.file_id != root_id:
 
265
    for file_id in work_inv:
 
266
        if (work_inv.get_file_kind(file_id) == 'directory' and
 
267
            not work_inv.is_root(file_id)):
291
268
            dir_cnt += 1
292
269
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
293
270
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
295
272
 
296
273
def _show_branch_stats(branch, verbose, outfile):
297
274
    """Show statistics about a branch."""
298
 
    try:
299
 
        revno, head = branch.last_revision_info()
300
 
    except errors.UnsupportedOperation:
301
 
        return {}
 
275
    revno, head = branch.last_revision_info()
302
276
    outfile.write('\n')
303
277
    outfile.write('Branch history:\n')
304
278
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
350
324
    try:
351
325
        tree = a_bzrdir.open_workingtree(
352
326
            recommend_upgrade=False)
353
 
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
 
327
    except (NoWorkingTree, NotLocalUrl):
354
328
        tree = None
355
329
        try:
356
 
            branch = a_bzrdir.open_branch(name="")
 
330
            branch = a_bzrdir.open_branch()
357
331
        except NotBranchError:
358
332
            branch = None
359
333
            try:
360
334
                repository = a_bzrdir.open_repository()
361
335
            except NoRepositoryPresent:
362
 
                lockable = None
363
 
                repository = None
 
336
                # Return silently; cmd_info already returned NotBranchError
 
337
                # if no bzrdir could be opened.
 
338
                return
364
339
            else:
365
340
                lockable = repository
366
341
        else:
371
346
        repository = branch.repository
372
347
        lockable = tree
373
348
 
374
 
    if lockable is not None:
375
 
        lockable.lock_read()
 
349
    lockable.lock_read()
376
350
    try:
377
351
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
378
352
                            outfile)
379
353
    finally:
380
 
        if lockable is not None:
381
 
            lockable.unlock()
 
354
        lockable.unlock()
382
355
 
383
356
 
384
357
def show_component_info(control, repository, branch=None, working=None,
390
363
        verbose = 1
391
364
    if verbose is True:
392
365
        verbose = 2
393
 
    layout = describe_layout(repository, branch, working, control)
 
366
    layout = describe_layout(repository, branch, working)
394
367
    format = describe_format(control, repository, branch, working)
395
368
    outfile.write("%s (format: %s)\n" % (layout, format))
396
 
    _show_location_info(
397
 
        gather_location_info(control=control, repository=repository,
398
 
            branch=branch, working=working),
399
 
        outfile)
 
369
    _show_location_info(gather_location_info(repository, branch, working),
 
370
                        outfile)
400
371
    if branch is not None:
401
372
        _show_related_info(branch, outfile)
402
373
    if verbose == 0:
403
374
        return
404
375
    _show_format_info(control, repository, branch, working, outfile)
405
376
    _show_locking_info(repository, branch, working, outfile)
406
 
    _show_control_dir_info(control, outfile)
407
377
    if branch is not None:
408
378
        _show_missing_revisions_branch(branch, outfile)
409
379
    if working is not None:
414
384
    if branch is not None:
415
385
        show_committers = verbose >= 2
416
386
        stats = _show_branch_stats(branch, show_committers, outfile)
417
 
    elif repository is not None:
 
387
    else:
418
388
        stats = repository.gather_stats()
419
 
    if branch is None and working is None and repository is not None:
 
389
    if branch is None and working is None:
420
390
        _show_repository_info(repository, outfile)
421
 
    if repository is not None:
422
 
        _show_repository_stats(repository, stats, outfile)
423
 
 
424
 
 
425
 
def describe_layout(repository=None, branch=None, tree=None, control=None):
 
391
    _show_repository_stats(repository, stats, outfile)
 
392
 
 
393
 
 
394
def describe_layout(repository=None, branch=None, tree=None):
426
395
    """Convert a control directory layout into a user-understandable term
427
396
 
428
397
    Common outputs include "Standalone tree", "Repository branch" and
429
398
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
430
399
    and "Empty control directory"
431
400
    """
432
 
    if branch is None and control is not None:
433
 
        try:
434
 
            branch_reference = control.get_branch_reference()
435
 
        except NotBranchError:
436
 
            pass
437
 
        else:
438
 
            if branch_reference is not None:
439
 
                return "Dangling branch reference"
440
401
    if repository is None:
441
402
        return 'Empty control directory'
442
403
    if branch is None and tree is None:
444
405
            phrase = 'Shared repository'
445
406
        else:
446
407
            phrase = 'Unshared repository'
447
 
        extra = []
448
408
        if repository.make_working_trees():
449
 
            extra.append('trees')
450
 
        if len(control.get_branches()) > 0:
451
 
            extra.append('colocated branches')
452
 
        if extra:
453
 
            phrase += ' with ' + " and ".join(extra)
 
409
            phrase += ' with trees'
454
410
        return phrase
455
411
    else:
456
412
        if repository.is_shared():
464
420
        if branch is None and tree is not None:
465
421
            phrase = "branchless tree"
466
422
        else:
467
 
            if (tree is not None and tree.user_url !=
468
 
                branch.user_url):
 
423
            if (tree is not None and tree.bzrdir.root_transport.base !=
 
424
                branch.bzrdir.root_transport.base):
469
425
                independence = ''
470
426
                phrase = "Lightweight checkout"
471
427
            elif branch.get_bound_location() is not None:
490
446
    """
491
447
    candidates  = []
492
448
    if (branch is not None and tree is not None and
493
 
        branch.user_url != tree.user_url):
 
449
        branch.bzrdir.root_transport.base !=
 
450
        tree.bzrdir.root_transport.base):
494
451
        branch = None
495
452
        repository = None
496
 
    non_aliases = set(controldir.format_registry.keys())
497
 
    non_aliases.difference_update(controldir.format_registry.aliases())
 
453
    non_aliases = set(bzrdir.format_registry.keys())
 
454
    non_aliases.difference_update(bzrdir.format_registry.aliases())
498
455
    for key in non_aliases:
499
 
        format = controldir.format_registry.make_bzrdir(key)
 
456
        format = bzrdir.format_registry.make_bzrdir(key)
500
457
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
501
458
            if (tree and format.workingtree_format !=
502
459
                tree._format):
514
471
        return 'unnamed'
515
472
    candidates.sort()
516
473
    new_candidates = [c for c in candidates if not
517
 
        controldir.format_registry.get_info(c).hidden]
 
474
        bzrdir.format_registry.get_info(c).hidden]
518
475
    if len(new_candidates) > 0:
519
476
        # If there are any non-hidden formats that match, only return those to
520
477
        # avoid listing hidden formats except when only a hidden format will
527
484
    """Hooks for the info command."""
528
485
 
529
486
    def __init__(self):
530
 
        super(InfoHooks, self).__init__("bzrlib.info", "hooks")
531
 
        self.add_hook('repository',
 
487
        super(InfoHooks, self).__init__()
 
488
        self.create_hook(_mod_hooks.HookPoint('repository',
532
489
            "Invoked when displaying the statistics for a repository. "
533
490
            "repository is called with a statistics dictionary as returned "
534
 
            "by the repository and a file-like object to write to.", (1, 15))
 
491
            "by the repository and a file-like object to write to.", (1, 15), 
 
492
            None))
535
493
 
536
494
 
537
495
hooks = InfoHooks()