← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/info.py

  • Committer: Aaron Bentley
  • Date: 2010-05-10 11:34:20 UTC
  • mfrom: (5218 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5221.
  • Revision ID: aaron@aaronbentley.com-20100510113420-toh2d5yioobb5uq1
Merged bzr.dev into transform-commit-full.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/info.py
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())