/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 bzrlib/check.py

  • Committer: Robert Collins
  • Date: 2008-02-06 04:06:42 UTC
  • mfrom: (3216 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3217.
  • Revision ID: robertc@robertcollins.net-20080206040642-2efx3l4iv5f95lxp
Merge up with bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
202
202
        self.inventory_weave.check(progress_bar=self.progress)
203
203
        files_in_revisions = {}
204
204
        revisions_of_files = {}
205
 
        weave_checker = self.repository.get_versioned_file_checker()
 
205
        weave_checker = self.repository._get_versioned_file_checker()
206
206
        for i, weave_id in enumerate(weave_ids):
207
207
            self.progress.update('checking versionedfile', i, n_weaves)
208
208
            w = self.repository.weave_store.get_weave(weave_id,
209
209
                    self.repository.get_transaction())
210
210
            # No progress here, because it looks ugly.
211
211
            w.check()
212
 
            result = weave_checker.check_file_version_parents(w, weave_id,
213
 
                self.planned_revisions)
 
212
            result = weave_checker.check_file_version_parents(w, weave_id)
214
213
            bad_parents, unused_versions = result
215
214
            bad_parents = bad_parents.items()
216
215
            for revision_id, (weave_parents, correct_parents) in bad_parents: