/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

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
118
118
            rev_history_position = None
119
119
        last_rev_id = None
120
120
        if rev_history_position:
121
 
            rev = branch.get_revision(rev_id)
 
121
            rev = branch.storage.get_revision(rev_id)
122
122
            if rev_history_position > 0:
123
123
                last_rev_id = self.history[rev_history_position - 1]
124
124
        else:
125
 
            rev = branch.get_revision(rev_id)
 
125
            rev = branch.storage.get_revision(rev_id)
126
126
                
127
127
        if rev.revision_id != rev_id:
128
128
            raise BzrCheckError('wrong internal revision id in revision {%s}'
158
158
                                % (rev_id, last_rev_id))
159
159
 
160
160
        if rev.inventory_sha1:
161
 
            inv_sha1 = branch.get_inventory_sha1(rev_id)
 
161
            inv_sha1 = branch.storage.get_inventory_sha1(rev_id)
162
162
            if inv_sha1 != rev.inventory_sha1:
163
163
                raise BzrCheckError('Inventory sha1 hash doesn\'t match'
164
164
                    ' value in revision {%s}' % rev_id)
169
169
        self.checked_rev_cnt += 1
170
170
 
171
171
    def _check_revision_tree(self, rev_id):
172
 
        tree = self.branch.revision_tree(rev_id)
 
172
        tree = self.branch.storage.revision_tree(rev_id)
173
173
        inv = tree.inventory
174
174
        seen_ids = {}
175
175
        for file_id in inv: