← 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-01-13 16:23:07 UTC
  • mto: (4634.119.7 2.0)
  • mto: This revision was merged to the branch mainline in revision 4959.
  • Revision ID: john@arbash-meinel.com-20100113162307-0bs82td16gzih827
Update the MANIFEST.in file.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
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."""
244
223
    """Show missing revisions in working tree."""
245
224
    branch = working.branch
246
225
    basis = working.basis_tree()
247
 
    try:
248
 
        branch_revno, branch_last_revision = branch.last_revision_info()
249
 
    except errors.UnsupportedOperation:
250
 
        return
 
226
    work_inv = working.inventory
 
227
    branch_revno, branch_last_revision = branch.last_revision_info()
251
228
    try:
252
229
        tree_last_id = working.get_parent_ids()[0]
253
230
    except IndexError:
264
241
def _show_working_stats(working, outfile):
265
242
    """Show statistics about a working tree."""
266
243
    basis = working.basis_tree()
 
244
    work_inv = working.inventory
267
245
    delta = working.changes_from(basis, want_unchanged=True)
268
246
 
269
247
    outfile.write('\n')
284
262
    outfile.write('  %8d ignored\n' % ignore_cnt)
285
263
 
286
264
    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:
 
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)):
290
268
            dir_cnt += 1
291
269
    outfile.write('  %8d versioned %s\n' % (dir_cnt,
292
270
        plural(dir_cnt, 'subdirectory', 'subdirectories')))
294
272
 
295
273
def _show_branch_stats(branch, verbose, outfile):
296
274
    """Show statistics about a branch."""
297
 
    try:
298
 
        revno, head = branch.last_revision_info()
299
 
    except errors.UnsupportedOperation:
300
 
        return {}
 
275
    revno, head = branch.last_revision_info()
301
276
    outfile.write('\n')
302
277
    outfile.write('Branch history:\n')
303
278
    outfile.write('  %8d revision%s\n' % (revno, plural(revno)))
349
324
    try:
350
325
        tree = a_bzrdir.open_workingtree(
351
326
            recommend_upgrade=False)
352
 
    except (NoWorkingTree, NotLocalUrl, NotBranchError):
 
327
    except (NoWorkingTree, NotLocalUrl):
353
328
        tree = None
354
329
        try:
355
330
            branch = a_bzrdir.open_branch()
358
333
            try:
359
334
                repository = a_bzrdir.open_repository()
360
335
            except NoRepositoryPresent:
361
 
                lockable = None
362
 
                repository = None
 
336
                # Return silently; cmd_info already returned NotBranchError
 
337
                # if no bzrdir could be opened.
 
338
                return
363
339
            else:
364
340
                lockable = repository
365
341
        else:
370
346
        repository = branch.repository
371
347
        lockable = tree
372
348
 
373
 
    if lockable is not None:
374
 
        lockable.lock_read()
 
349
    lockable.lock_read()
375
350
    try:
376
351
        show_component_info(a_bzrdir, repository, branch, tree, verbose,
377
352
                            outfile)
378
353
    finally:
379
 
        if lockable is not None:
380
 
            lockable.unlock()
 
354
        lockable.unlock()
381
355
 
382
356
 
383
357
def show_component_info(control, repository, branch=None, working=None,
389
363
        verbose = 1
390
364
    if verbose is True:
391
365
        verbose = 2
392
 
    layout = describe_layout(repository, branch, working, control)
 
366
    layout = describe_layout(repository, branch, working)
393
367
    format = describe_format(control, repository, branch, working)
394
368
    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)
 
369
    _show_location_info(gather_location_info(repository, branch, working),
 
370
                        outfile)
399
371
    if branch is not None:
400
372
        _show_related_info(branch, outfile)
401
373
    if verbose == 0:
402
374
        return
403
375
    _show_format_info(control, repository, branch, working, outfile)
404
376
    _show_locking_info(repository, branch, working, outfile)
405
 
    _show_control_dir_info(control, outfile)
406
377
    if branch is not None:
407
378
        _show_missing_revisions_branch(branch, outfile)
408
379
    if working is not None:
420
391
    _show_repository_stats(repository, stats, outfile)
421
392
 
422
393
 
423
 
def describe_layout(repository=None, branch=None, tree=None, control=None):
 
394
def describe_layout(repository=None, branch=None, tree=None):
424
395
    """Convert a control directory layout into a user-understandable term
425
396
 
426
397
    Common outputs include "Standalone tree", "Repository branch" and
427
398
    "Checkout".  Uncommon outputs include "Unshared repository with trees"
428
399
    and "Empty control directory"
429
400
    """
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
401
    if repository is None:
439
402
        return 'Empty control directory'
440
403
    if branch is None and tree is None:
457
420
        if branch is None and tree is not None:
458
421
            phrase = "branchless tree"
459
422
        else:
460
 
            if (tree is not None and tree.user_url !=
461
 
                branch.user_url):
 
423
            if (tree is not None and tree.bzrdir.root_transport.base !=
 
424
                branch.bzrdir.root_transport.base):
462
425
                independence = ''
463
426
                phrase = "Lightweight checkout"
464
427
            elif branch.get_bound_location() is not None:
483
446
    """
484
447
    candidates  = []
485
448
    if (branch is not None and tree is not None and
486
 
        branch.user_url != tree.user_url):
 
449
        branch.bzrdir.root_transport.base !=
 
450
        tree.bzrdir.root_transport.base):
487
451
        branch = None
488
452
        repository = None
489
 
    non_aliases = set(controldir.format_registry.keys())
490
 
    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())
491
455
    for key in non_aliases:
492
 
        format = controldir.format_registry.make_bzrdir(key)
 
456
        format = bzrdir.format_registry.make_bzrdir(key)
493
457
        if isinstance(format, bzrdir.BzrDirMetaFormat1):
494
458
            if (tree and format.workingtree_format !=
495
459
                tree._format):
507
471
        return 'unnamed'
508
472
    candidates.sort()
509
473
    new_candidates = [c for c in candidates if not
510
 
        controldir.format_registry.get_info(c).hidden]
 
474
        bzrdir.format_registry.get_info(c).hidden]
511
475
    if len(new_candidates) > 0:
512
476
        # If there are any non-hidden formats that match, only return those to
513
477
        # avoid listing hidden formats except when only a hidden format will
520
484
    """Hooks for the info command."""
521
485
 
522
486
    def __init__(self):
523
 
        super(InfoHooks, self).__init__("bzrlib.info", "hooks")
524
 
        self.add_hook('repository',
 
487
        self.create_hook(_mod_hooks.HookPoint('repository',
525
488
            "Invoked when displaying the statistics for a repository. "
526
489
            "repository is called with a statistics dictionary as returned "
527
 
            "by the repository and a file-like object to write to.", (1, 15))
 
490
            "by the repository and a file-like object to write to.", (1, 15), 
 
491
            None))
528
492
 
529
493
 
530
494
hooks = InfoHooks()