← 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-08-13 19:08:57 UTC
  • mto: (5050.17.7 2.2)
  • mto: This revision was merged to the branch mainline in revision 5379.
  • Revision ID: john@arbash-meinel.com-20100813190857-mvzwnimrxvm0zimp
Lots of documentation updates.

We had a lot of http links pointing to the old domain. They should
all now be properly updated to the new domain. (only bazaar-vcs.org
entry left is for pqm, which seems to still reside at the old url.)

Also removed one 'TODO' doc entry about switching to binary xdelta, since
we basically did just that with groupcompress.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
1
 
# Copyright (C) 2005, 2006, 2007 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
17
17
__all__ = ['show_bzrdir_info']
18
18
 
19
19
from cStringIO import StringIO
20
 
import os
21
20
import time
22
21
import sys
23
22
 
24
23
from bzrlib import (
25
24
    bzrdir,
26
 
    diff,
27
25
    errors,
28
26
    hooks as _mod_hooks,
29
27
    osutils,
80
78
 
81
79
def gather_location_info(repository, branch=None, working=None):
82
80
    locs = {}
83
 
    repository_path = repository.bzrdir.root_transport.base
 
81
    repository_path = repository.user_url
84
82
    if branch is not None:
85
 
        branch_path = branch.bzrdir.root_transport.base
 
83
        branch_path = branch.user_url
86
84
        master_path = branch.get_bound_location()
87
85
        if master_path is None:
88
86
            master_path = branch_path
90
88
        branch_path = None
91
89
        master_path = None
92
90
    if working:
93
 
        working_path = working.bzrdir.root_transport.base
 
91
        working_path = working.user_url
94
92
        if working_path != branch_path:
95
93
            locs['light checkout root'] = working_path
96
94
        if master_path != branch_path:
420
418
        if branch is None and tree is not None:
421
419
            phrase = "branchless tree"
422
420
        else:
423
 
            if (tree is not None and tree.bzrdir.root_transport.base !=
424
 
                branch.bzrdir.root_transport.base):
 
421
            if (tree is not None and tree.user_url !=
 
422
                branch.user_url):
425
423
                independence = ''
426
424
                phrase = "Lightweight checkout"
427
425
            elif branch.get_bound_location() is not None:
446
444
    """
447
445
    candidates  = []
448
446
    if (branch is not None and tree is not None and
449
 
        branch.bzrdir.root_transport.base !=
450
 
        tree.bzrdir.root_transport.base):
 
447
        branch.user_url != tree.user_url):
451
448
        branch = None
452
449
        repository = None
453
450
    non_aliases = set(bzrdir.format_registry.keys())
484
481
    """Hooks for the info command."""
485
482
 
486
483
    def __init__(self):
 
484
        super(InfoHooks, self).__init__()
487
485
        self.create_hook(_mod_hooks.HookPoint('repository',
488
486
            "Invoked when displaying the statistics for a repository. "
489
487
            "repository is called with a statistics dictionary as returned "