← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

Merge with annotate

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
55
55
        self.missing_revision_cnt = 0
56
56
        # maps (file-id, version) -> sha1; used by InventoryFile._check
57
57
        self.checked_texts = {}
58
 
        self.checked_weaves = {}
 
58
        self.checked_weaves = set()
59
59
        self.unreferenced_versions = set()
60
60
        self.inconsistent_parents = []
61
61
 
66
66
            self.progress.update('retrieving inventory', 0, 2)
67
67
            # do not put in init, as it should be done with progess,
68
68
            # and inside the lock.
69
 
            self.inventory_weave = self.repository.get_inventory_weave()
 
69
            self.inventory_weave = self.repository.inventories
70
70
            self.progress.update('checking revision graph', 1)
71
71
            self.check_revision_graph()
72
72
            self.plan_revisions()
96
96
        repository = self.repository
97
97
        self.planned_revisions = repository.all_revision_ids()
98
98
        self.progress.clear()
99
 
        inventoried = set(self.inventory_weave.versions())
 
99
        inventoried = set(key[-1] for key in self.inventory_weave.keys())
100
100
        awol = set(self.planned_revisions) - inventoried
101
101
        if len(awol) > 0:
102
102
            raise BzrCheckError('Stored revisions missing from inventory'
193
193
    def check_weaves(self):
194
194
        """Check all the weaves we can get our hands on.
195
195
        """
196
 
        n_weaves = 1
197
196
        weave_ids = []
198
 
        if self.repository.weave_store.listable():
199
 
            weave_ids = list(self.repository.weave_store)
200
 
            n_weaves = len(weave_ids) + 1
201
 
        self.progress.update('checking versionedfile', 0, n_weaves)
 
197
        self.progress.update('checking inventory', 0, 2)
202
198
        self.inventory_weave.check(progress_bar=self.progress)
203
 
        files_in_revisions = {}
204
 
        revisions_of_files = {}
 
199
        self.progress.update('checking text storage', 1, 2)
 
200
        self.repository.texts.check(progress_bar=self.progress)
205
201
        weave_checker = self.repository._get_versioned_file_checker()
206
 
        # XXX: for pack repositories, this iteration seems a bit redundant
207
 
        # with iteration also done within the versioned file checker.  also
208
 
        # note that the inventory/revision/signature data is not included in
209
 
        # this enumeration -- mbp 20080528
210
 
        for i, weave_id in enumerate(weave_ids):
211
 
            self.progress.update('checking versionedfile', i, n_weaves)
212
 
            w = self.repository.weave_store.get_weave(weave_id,
213
 
                    self.repository.get_transaction())
214
 
            # No progress here, because it looks ugly.
215
 
            w.check()
216
 
            result = weave_checker.check_file_version_parents(w, weave_id)
217
 
            bad_parents, unused_versions = result
218
 
            bad_parents = bad_parents.items()
219
 
            for revision_id, (weave_parents, correct_parents) in bad_parents:
220
 
                self.inconsistent_parents.append(
221
 
                    (revision_id, weave_id, weave_parents, correct_parents))
222
 
            for revision_id in unused_versions:
223
 
                self.unreferenced_versions.add((weave_id, revision_id))
224
 
            self.checked_weaves[weave_id] = True
 
202
        result = weave_checker.check_file_version_parents(
 
203
            self.repository.texts, progress_bar=self.progress)
 
204
        self.checked_weaves = weave_checker.file_ids
 
205
        bad_parents, unused_versions = result
 
206
        bad_parents = bad_parents.items()
 
207
        for text_key, (stored_parents, correct_parents) in bad_parents:
 
208
            # XXX not ready for id join/split operations.
 
209
            weave_id = text_key[0]
 
210
            revision_id = text_key[-1]
 
211
            weave_parents = tuple([parent[-1] for parent in stored_parents])
 
212
            correct_parents = tuple([parent[-1] for parent in correct_parents])
 
213
            self.inconsistent_parents.append(
 
214
                (revision_id, weave_id, weave_parents, correct_parents))
 
215
        self.unreferenced_versions.update(unused_versions)
225
216
 
226
217
    def _check_revision_tree(self, rev_id):
227
218
        tree = self.repository.revision_tree(rev_id)