← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/inventory.py

Merge thread.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/inventory.py
484
484
                checker.repeated_text_cnt += 1
485
485
                return
486
486
 
487
 
        if self.file_id not in checker.checked_weaves:
488
 
            mutter('check weave {%s}', self.file_id)
489
 
            w = tree._get_weave(self.file_id)
490
 
            # Not passing a progress bar, because it creates a new
491
 
            # progress, which overwrites the current progress,
492
 
            # and doesn't look nice
493
 
            w.check()
494
 
            checker.checked_weaves[self.file_id] = True
495
 
        else:
496
 
            w = tree._get_weave(self.file_id)
497
 
 
498
487
        mutter('check version {%s} of {%s}', tree_revision_id, self.file_id)
499
488
        checker.checked_text_cnt += 1
500
489
        # We can't check the length, because Weave doesn't store that
501
490
        # information, and the whole point of looking at the weave's
502
491
        # sha1sum is that we don't have to extract the text.
503
 
        if self.text_sha1 != w.get_sha1s([self.revision])[0]:
 
492
        if (self.text_sha1 !=
 
493
            tree._repository.texts.get_sha1s([(self.file_id, self.revision)])[0]):
504
494
            raise BzrCheckError('text {%s} version {%s} wrong sha1' 
505
495
                                % (self.file_id, self.revision))
506
496
        checker.checked_texts[t] = self.text_sha1