/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-06-10 00:52:08 UTC
  • mfrom: (6675 work)
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610005208-dthx80fkolfpsenj
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/branchbuilder.py
25
25
    memorytree,
26
26
    revision,
27
27
    )
 
28
from .sixish import (
 
29
    viewitems,
 
30
    )
28
31
 
29
32
 
30
33
class BranchBuilder(object):
277
280
        if pending.to_unversion_ids:
278
281
            tree.unversion(pending.to_unversion_ids)
279
282
        tree.add(pending.to_add_files, pending.to_add_file_ids, pending.to_add_kinds)
280
 
        for file_id, content in pending.new_contents.iteritems():
 
283
        for file_id, content in viewitems(pending.new_contents):
281
284
            tree.put_file_bytes_non_atomic(file_id, content)
282
285
 
283
286
    def get_branch(self):