/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-10 16:14:20 UTC
  • mto: (0.219.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081110161420-bax1raw5jkm1p67h
Import fixes from bzr-svn.

Show diffs side-by-side

added added

removed removed

Lines of Context:
upgrade.py
17
17
 
18
18
from bzrlib import ui
19
19
from bzrlib.errors import BzrError, InvalidRevisionId, DependencyNotPresent
 
20
from bzrlib.revision import Revision
20
21
from bzrlib.trace import info
21
22
 
22
23
import itertools
228
229
            repository.fetch(foreign_repository, revid)
229
230
 
230
231
    if not allow_changes:
231
 
        for oldrevid, newrevid in upgrade_map.iteritems():
 
232
        for oldrevid, newrevid in upgrade_map.items():
232
233
            oldrev = repository.get_revision(oldrevid)
233
234
            newrev = repository.get_revision(newrevid)
234
235
            check_revision_changed(oldrev, newrev)
242
243
      graph, lambda revid: create_upgraded_revid(revid, new_mapping.upgrade_suffix))
243
244
    def remove_parents((oldrevid, (newrevid, parents))):
244
245
        return (oldrevid, newrevid)
245
 
    upgrade_map.update(dict(map(remove_parents, plan.iteritems())))
 
246
    upgrade_map.update(dict(map(remove_parents, plan.items())))
246
247
 
247
248
    return (plan, upgrade_map)
248
249