/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: 2019-06-22 11:51:56 UTC
  • mfrom: (7356 work)
  • mto: This revision was merged to the branch mainline in revision 7358.
  • Revision ID: jelmer@jelmer.uk-20190622115156-20uwy6b97g94bbv1
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
38
38
    text_type,
39
39
    )
40
40
from .trace import warning
41
 
from .transform import TreeTransform, resolve_conflicts, cook_conflicts
 
41
from .transform import resolve_conflicts, cook_conflicts
42
42
from .transport import get_transport
43
43
from .workingtree import WorkingTree
44
44
 
232
232
 
233
233
 
234
234
def import_archive(tree, archive_file):
235
 
    tt = TreeTransform(tree)
236
 
    try:
 
235
    with tree.get_transform() as tt:
237
236
        import_archive_to_transform(tree, archive_file, tt)
238
237
        tt.apply()
239
 
    finally:
240
 
        tt.finalize()
241
238
 
242
239
 
243
240
def import_archive_to_transform(tree, archive_file, tt):