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

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branchbuilder.py
280
280
        for from_relpath, to_relpath in pending.to_rename:
281
281
            tree.rename_one(from_relpath, to_relpath)
282
282
        if pending.to_unversion_ids:
283
 
            tree.unversion(pending.to_unversion_ids)
 
283
            tree.unversion([tree.id2path(fid) for fid in pending.to_unversion_ids])
284
284
        tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
285
285
        for file_id, content in viewitems(pending.new_contents):
286
 
            tree.put_file_bytes_non_atomic(file_id, content)
 
286
            tree.put_file_bytes_non_atomic(
 
287
                    tree.id2path(file_id), content,
 
288
                    file_id=file_id)
287
289
 
288
290
    def get_branch(self):
289
291
        """Return the branch created by the builder."""