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

  • Committer: Jelmer Vernooij
  • Date: 2008-11-12 14:36:10 UTC
  • mto: (0.219.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081112143610-30109vbbkeuj94y0
import bzr-svn improvements.

Show diffs side-by-side

added added

removed removed

Lines of Context:
upgrade.py
228
228
            repository.fetch(foreign_repository, revid)
229
229
 
230
230
    if not allow_changes:
231
 
        for oldrevid, newrevid in upgrade_map.iteritems():
 
231
        for oldrevid, newrevid in upgrade_map.items():
232
232
            oldrev = repository.get_revision(oldrevid)
233
233
            newrev = repository.get_revision(newrevid)
234
234
            check_revision_changed(oldrev, newrev)
242
242
      graph, lambda revid: create_upgraded_revid(revid, new_mapping.upgrade_suffix))
243
243
    def remove_parents((oldrevid, (newrevid, parents))):
244
244
        return (oldrevid, newrevid)
245
 
    upgrade_map.update(dict(map(remove_parents, plan.iteritems())))
 
245
    upgrade_map.update(dict(map(remove_parents, plan.items())))
246
246
 
247
247
    return (plan, upgrade_map)
248
248