Rev 4353: Clearer code. in http://people.ubuntu.com/~robertc/baz2.0/check

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/check

------------------------------------------------------------
revno: 4353
revision-id: robertc at robertcollins.net-20090512064737-iu2ktc3bryvqdyt3
parent: robertc at robertcollins.net-20090512063317-77tyeab01ua3v8uv
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Tue 2009-05-12 16:47:37 +1000
message:
  Clearer code.
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py	2009-05-12 06:33:17 +0000
+++ b/bzrlib/check.py	2009-05-12 06:47:37 +0000
@@ -102,13 +102,9 @@
             if self.check_repo:
                 self.progress.update('checking revision graph', 0)
                 self.check_revision_graph()
-                # do not put in init, as it should be done with progess,
-                # and inside the lock.
-                self.inventory_weave = self.repository.inventories
-                self.planned_revisions = list(self.planned_revisions)
-                revno = 0
                 self.progress.update('checking revisions', 1)
                 revbar = bzrlib.ui.ui_factory.nested_progress_bar()
+                revno = 0
                 try:
                     while revno < len(self.planned_revisions):
                         rev_id = self.planned_revisions[revno]
@@ -178,6 +174,7 @@
         for revid, revision in revisions_iterator:
             yield revid, revision
             self._check_one_rev(revid, revision)
+        self.planned_revisions = list(self.planned_revisions)
 
     def check_revision_graph(self):
         revision_iterator = self.repository._iter_revisions(None)
@@ -315,7 +312,10 @@
 
     def _check_weaves(self, storebar):
         storebar.update('inventory', 0, 4)
-        self.inventory_weave.check(progress_bar=storebar)
+        # do not put in init, as it should be done with progess,
+        # and inside the lock.
+        inventory_weave = self.repository.inventories
+        inventory_weave.check(progress_bar=storebar)
         storebar.update('text-deltas', 1)
         self.repository.texts.check(progress_bar=storebar)
         storebar.update('text-index', 2)