/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-18 23:14:00 UTC
  • mfrom: (7490.40.62 work)
  • mto: This revision was merged to the branch mainline in revision 7519.
  • Revision ID: jelmer@jelmer.uk-20200718231400-jaes9qltn8oi8xss
Merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/upstream_import.py
227
227
 
228
228
 
229
229
def import_archive(tree, archive_file):
230
 
    with tree.get_transform() as tt:
 
230
    with tree.transform() as tt:
231
231
        import_archive_to_transform(tree, archive_file, tt)
232
232
        tt.apply()
233
233
 
285
285
        if tt.tree_file_id(trans_id) is None:
286
286
            name = basename(member.name.rstrip('/'))
287
287
            file_id = generate_ids.gen_file_id(name)
288
 
            tt.version_file(file_id, trans_id)
 
288
            tt.version_file(trans_id, file_id=file_id)
289
289
 
290
290
    for relative_path in implied_parents.difference(added):
291
291
        if relative_path == "":
294
294
        path = tree.abspath(relative_path)
295
295
        do_directory(tt, trans_id, tree, relative_path, path)
296
296
        if tt.tree_file_id(trans_id) is None:
297
 
            tt.version_file(trans_id, trans_id)
 
297
            tt.version_file(trans_id, file_id=trans_id)
298
298
        added.add(relative_path)
299
299
 
300
300
    for path in removed.difference(added):