/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/upstream_import.py

  • Committer: Jelmer Vernooij
  • Date: 2020-07-05 12:50:01 UTC
  • mfrom: (7490.40.46 work)
  • mto: (7490.40.48 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200705125001-7s3vo0p55szbbws7
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
16
16
 
17
17
"""Import upstream source into a branch"""
18
18
 
 
19
from __future__ import absolute_import
 
20
 
19
21
import errno
20
22
from io import (
21
23
    BytesIO,
32
34
from .errors import (BzrError, NoSuchFile, CommandError, NotBranchError)
33
35
from .osutils import (pathjoin, isdir, file_iterator, basename,
34
36
                      file_kind, splitpath)
 
37
from .sixish import (
 
38
    text_type,
 
39
    )
35
40
from .trace import warning
36
 
from .transform import resolve_conflicts
 
41
from .transform import resolve_conflicts, cook_conflicts
37
42
from .transport import get_transport
38
43
from .workingtree import WorkingTree
39
44
 
253
258
        # interpret relative to fs encoding, which would match native
254
259
        # behaviour better.
255
260
        relative_path = member.name
256
 
        if not isinstance(relative_path, str):
 
261
        if not isinstance(relative_path, text_type):
257
262
            relative_path = relative_path.decode('utf-8')
258
263
        if prefix is not None:
259
264
            relative_path = relative_path[len(prefix) + 1:]
300
305
    for path in removed.difference(added):
301
306
        tt.unversion_file(tt.trans_id_tree_path(path))
302
307
 
303
 
    for conflict in tt.cook_conflicts(resolve_conflicts(tt)):
 
308
    for conflict in cook_conflicts(resolve_conflicts(tt), tt):
304
309
        warning(conflict)
305
310
 
306
311