/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/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2020-08-09 18:10:01 UTC
  • mto: (7490.133.15 transform)
  • mto: This revision was merged to the branch mainline in revision 7521.
  • Revision ID: jelmer@jelmer.uk-20200809181001-bt9wdmmquzij3e5l
Split out bzr-specific Conflicts code.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
28
28
    transform,
29
29
    )
30
30
from ...bzr import (
 
31
    conflicts as _mod_bzr_conflicts,
31
32
    inventory,
32
33
    xml5,
33
34
    )
45
46
 
46
47
 
47
48
def get_conflicted_stem(path):
48
 
    for suffix in _mod_conflicts.CONFLICT_SUFFIXES:
 
49
    for suffix in _mod_bzr_conflicts.CONFLICT_SUFFIXES:
49
50
        if path.endswith(suffix):
50
51
            return path[:-len(suffix)]
51
52
 
234
235
                            break
235
236
                ctype = {True: 'text conflict',
236
237
                         False: 'contents conflict'}[text]
237
 
                conflicts.append(_mod_conflicts.Conflict.factory(ctype,
 
238
                conflicts.append(_mod_bzr_conflicts.Conflict.factory(ctype,
238
239
                                                                 path=conflicted,
239
240
                                                                 file_id=self.path2id(conflicted)))
240
241
            return conflicts