← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Jelmer Vernooij
  • Date: 2010-04-30 11:03:59 UTC
  • mto: This revision was merged to the branch mainline in revision 5197.
  • Revision ID: jelmer@samba.org-20100430110359-ow3e3grh7sxy93pa
Remove more unused imports.

Show diffs side-by-side

added added

removed removed

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