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

  • Committer: Martin
  • Date: 2017-06-05 20:48:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6658.
  • Revision ID: gzlist@googlemail.com-20170605204831-20accykspjcrx0a8
Apply 2to3 dict fixer and clean up resulting mess using view helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/workingtree.py
2343
2343
    @needs_tree_write_lock
2344
2344
    def set_merge_modified(self, modified_hashes):
2345
2345
        def iter_stanzas():
2346
 
            for file_id, hash in modified_hashes.iteritems():
 
2346
            for file_id in modified_hashes:
2347
2347
                yield _mod_rio.Stanza(file_id=file_id.decode('utf8'),
2348
 
                    hash=hash)
 
2348
                    hash=modified_hashes[file_id])
2349
2349
        self._put_rio('merge-hashes', iter_stanzas(), MERGE_MODIFIED_HEADER_1)
2350
2350
 
2351
2351
    @needs_read_lock