/b-gtk/fix-viz

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/b-gtk/fix-viz

« back to all changes in this revision

Viewing changes to olive/info_helper.py

  • Committer: Szilveszter Farkas (Phanatic)
  • Date: 2007-03-15 16:23:15 UTC
  • mfrom: (170 trunk)
  • mto: (170.1.3 trunk)
  • mto: This revision was merged to the branch mainline in revision 172.
  • Revision ID: szilveszter.farkas@gmail.com-20070315162315-rs1sbxjh31n314zc
Merge from trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
olive/info_helper.py
22
22
 
23
23
import bzrlib.osutils as osutils
24
24
 
25
 
from bzrlib.info import _repo_relpath
 
25
from bzrlib.info import _repo_rel_url
26
26
from bzrlib.missing import find_unmerged
27
27
 
28
28
def get_location_info(repository, branch=None, working=None):
41
41
            if repository.is_shared():
42
42
                # lightweight checkout of branch in shared repository
43
43
                ret['sharedrepo'] = repository_path
44
 
                ret['repobranch'] = _repo_relpath(repository_path, branch_path)
 
44
                ret['repobranch'] = _repo_rel_url(repository_path, branch_path)
45
45
            else:
46
46
                # lightweight checkout of standalone branch
47
47
                ret['cobranch'] = branch_path
48
48
        elif repository.is_shared():
49
49
            # branch with tree inside shared repository
50
50
            ret['sharedrepo'] = repository_path
51
 
            ret['repoco'] = _repo_relpath(repository_path, branch_path)
 
51
            ret['repoco'] = _repo_rel_url(repository_path, branch_path)
52
52
        elif branch.get_bound_location():
53
53
            # normal checkout
54
54
            ret['coroot'] = working_path
61
61
        if repository.is_shared():
62
62
            # branch is part of shared repository
63
63
            ret['sharedrepo'] = repository_path
64
 
            ret['repobranch'] = _repo_relpath(repository_path, branch_path)
 
64
            ret['repobranch'] = _repo_rel_url(repository_path, branch_path)
65
65
        else:
66
66
            # standalone branch
67
67
            ret['branchroot'] = branch_path