Rev 1524: Always store file id map. in http://people.samba.org/bzr/jelmer/bzr-svn/trunk

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/trunk

------------------------------------------------------------
revno: 1524
revision-id: jelmer at samba.org-20080802165621-55sj621gg0nlflnz
parent: jelmer at samba.org-20080802165612-k97ek0a5br69k4ue
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sat 2008-08-02 18:56:21 +0200
message:
  Always store file id map.
modified:
  fileids.py                     fileids.py-20060714013623-u5iiyqqnko11grcf-1
=== modified file 'fileids.py'
--- a/fileids.py	2008-07-23 20:45:18 +0000
+++ b/fileids.py	2008-08-02 16:56:21 +0000
@@ -279,9 +279,7 @@
             for i, revmeta in enumerate(reversed(todo)):
                 pb.update('generating file id map', i, len(todo))
                 revid = revmeta.get_revision_id(mapping)
-                expensive = False
                 def log_find_children(path, revnum):
-                    expensive = True
                     return self.repos._log.find_children(path, revnum)
 
                 (idmap, changes) = self.actual.apply_changes(
@@ -291,14 +289,9 @@
 
                 parent_revs = next_parent_revs
                        
-                saved = False
-                if i % 500 == 0 or expensive:
-                    self.save(revid, parent_revs, map)
-                    saved = True
+                self.save(revid, parent_revs, map)
                 next_parent_revs = [revid]
         finally:
             pb.finished()
-        if not saved:
-            self.save(revid, parent_revs, map)
         return map