← 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-04-21 09:57:18 UTC
  • mto: This revision was merged to the branch mainline in revision 5189.
  • Revision ID: mbp@canonical.com-20100421095718-u3c4w7k1crba29fq
Change info code to use user_url etc

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
80
80
 
81
81
def gather_location_info(repository, branch=None, working=None):
82
82
    locs = {}
83
 
    repository_path = repository.bzrdir.root_transport.base
 
83
    repository_path = repository.user_url
84
84
    if branch is not None:
85
 
        branch_path = branch.bzrdir.root_transport.base
 
85
        branch_path = branch.user_url
86
86
        master_path = branch.get_bound_location()
87
87
        if master_path is None:
88
88
            master_path = branch_path
90
90
        branch_path = None
91
91
        master_path = None
92
92
    if working:
93
 
        working_path = working.bzrdir.root_transport.base
 
93
        working_path = working.user_url
94
94
        if working_path != branch_path:
95
95
            locs['light checkout root'] = working_path
96
96
        if master_path != branch_path:
420
420
        if branch is None and tree is not None:
421
421
            phrase = "branchless tree"
422
422
        else:
423
 
            if (tree is not None and tree.bzrdir.root_transport.base !=
424
 
                branch.bzrdir.root_transport.base):
 
423
            if (tree is not None and tree.user_url !=
 
424
                branch.user_url):
425
425
                independence = ''
426
426
                phrase = "Lightweight checkout"
427
427
            elif branch.get_bound_location() is not None:
446
446
    """
447
447
    candidates  = []
448
448
    if (branch is not None and tree is not None and
449
 
        branch.bzrdir.root_transport.base !=
450
 
        tree.bzrdir.root_transport.base):
 
449
        branch.user_url != tree.user_url):
451
450
        branch = None
452
451
        repository = None
453
452
    non_aliases = set(bzrdir.format_registry.keys())