/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/info.py

  • Committer: Jelmer Vernooij
  • Date: 2019-01-01 21:38:07 UTC
  • mfrom: (7228 work)
  • mto: This revision was merged to the branch mainline in revision 7233.
  • Revision ID: jelmer@jelmer.uk-20190101213807-ay6uqghz0nnrgjvx
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/info.py
108
108
            else:
109
109
                locs['checkout root'] = branch_path
110
110
        if working_path != master_path:
111
 
            locs['checkout of branch'] = master_path
 
111
            (master_path_base, params) = urlutils.split_segment_parameters(
 
112
                master_path)
 
113
            if working_path == master_path_base:
 
114
                locs['checkout of co-located branch'] = params['branch']
 
115
            elif 'branch' in params:
 
116
                locs['checkout of branch'] = "%s, branch %s" (
 
117
                    master_path_base, params['branch'])
 
118
            else:
 
119
                locs['checkout of branch'] = master_path
112
120
        elif repository.is_shared():
113
121
            locs['repository branch'] = branch_path
114
122
        elif branch_path is not None:
138
146
        locs['shared repository'] = repository.user_url
139
147
    order = ['control directory', 'light checkout root',
140
148
             'repository checkout root', 'checkout root',
141
 
             'checkout of branch', 'shared repository',
142
 
             'repository', 'repository branch', 'branch root',
143
 
             'bound to branch']
 
149
             'checkout of branch', 'checkout of co-located branch',
 
150
             'shared repository', 'repository', 'repository branch',
 
151
             'branch root', 'bound to branch']
144
152
    return [(n, locs[n]) for n in order if n in locs]
145
153
 
146
154