Rev 4362: Fix check_weaves. in http://people.ubuntu.com/~robertc/baz2.0/check

[Robert Collins]

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

------------------------------------------------------------
revno: 4362
revision-id: robertc at robertcollins.net-20090616005341-8wjrea4qp6wq0r0l
parent: robertc at robertcollins.net-20090616003941-i3kmn1kle3gnih0z
committer: Robert Collins <robertc at robertcollins.net>
branch nick: check
timestamp: Tue 2009-06-16 10:53:41 +1000
message:
  Fix check_weaves.
=== modified file 'bzrlib/check.py'
--- a/bzrlib/check.py	2009-06-16 00:39:41 +0000
+++ b/bzrlib/check.py	2009-06-16 00:53:41 +0000
@@ -299,17 +299,17 @@
 
     def _check_weaves(self, storebar):
         storebar.update('text-index', 0, 2)
-        weave_checker = self.repository._get_versioned_file_checker(
-            ancestors=self.ancestors)
-        storebar.update('file-graph', 1)
         if self.repository._format.fast_deltas:
             # We haven't considered every fileid instance so far.
-            result = weave_checker.check_file_version_parents(
-                self.repository.texts)
+            weave_checker = self.repository._get_versioned_file_checker(
+                ancestors=self.ancestors)
         else:
-            result = weave_checker.check_file_version_parents(
+            weave_checker = self.repository._get_versioned_file_checker(
                 text_key_references=self.text_key_references,
-                self.repository.texts)
+                ancestors=self.ancestors)
+        storebar.update('file-graph', 1)
+        result = weave_checker.check_file_version_parents(
+            self.repository.texts)
         self.checked_weaves = weave_checker.file_ids
         bad_parents, unused_versions = result
         bad_parents = bad_parents.items()