Rev 120: Simplify. in file:///home/jelmer/bzr-rebase/trunk/

[Jelmer Vernooij]

At file:///home/jelmer/bzr-rebase/trunk/

------------------------------------------------------------
revno: 120
revision-id: jelmer at samba.org-20090201012454-kj6i3dedjxvfpt2b
parent: jelmer at samba.org-20090201011832-pz4rf7llg5ay3ktp
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: trunk
timestamp: Sun 2009-02-01 02:24:54 +0100
message:
  Simplify.
modified:
  rebase.py                      rebase.py-20070626221123-ellanmf93nw8z9r1-1
=== modified file 'rebase.py'
--- a/rebase.py	2009-02-01 01:18:32 +0000
+++ b/rebase.py	2009-02-01 01:24:54 +0000
@@ -362,9 +362,9 @@
         i = 0
         try:
             parent_invs = map(repository.get_revision_inventory, new_parents)
-            for path, ie in oldtree.inventory.iter_entries():
-                pb.update('upgrading file', i, total)
-                ie = ie.copy()
+            for i, (path, old_ie) in enumerate(oldtree.inventory.iter_entries()):
+                pb.update('upgrading file', i, len(oldtree.inventory))
+                ie = old_ie.copy()
                 # Either this file was modified last in this revision, 
                 # in which case it has to be rewritten
                 if fix_revid is not None:
@@ -386,7 +386,6 @@
                         inv[ie.file_id].text_sha1 == ie.text_sha1, parent_invs))
                         == 0):
                         raise ReplayParentsInconsistent(ie.file_id, ie.revision)
-                i += 1
                 builder.record_entry_contents(ie, parent_invs, path, oldtree,
                         oldtree.path_content_summary(path))
         finally: