/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-25 03:16:20 UTC
  • mto: (0.219.2 trunk)
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@samba.org-20081125031620-h4plmbufgsdjcqiw
Remove elements pending to be included in bzrlib.

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
21
20
from bzrlib.trace import info
22
21
 
23
22
import itertools
229
228
            repository.fetch(foreign_repository, revid)
230
229
 
231
230
    if not allow_changes:
232
 
        for oldrevid, newrevid in upgrade_map.items():
 
231
        for oldrevid, newrevid in upgrade_map.iteritems():
233
232
            oldrev = repository.get_revision(oldrevid)
234
233
            newrev = repository.get_revision(newrevid)
235
234
            check_revision_changed(oldrev, newrev)
243
242
      graph, lambda revid: create_upgraded_revid(revid, new_mapping.upgrade_suffix))
244
243
    def remove_parents((oldrevid, (newrevid, parents))):
245
244
        return (oldrevid, newrevid)
246
 
    upgrade_map.update(dict(map(remove_parents, plan.items())))
 
245
    upgrade_map.update(dict(map(remove_parents, plan.iteritems())))
247
246
 
248
247
    return (plan, upgrade_map)
249
248