← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

Merge from integration.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
41
41
 
42
42
    def __init__(self, branch):
43
43
        self.branch = branch
44
 
        self.inventory_weave = branch._get_inventory_weave()
45
44
        self.checked_text_cnt = 0
46
45
        self.checked_rev_cnt = 0
47
46
        self.ghosts = []
51
50
        self.missing_revision_cnt = 0
52
51
        # maps (file-id, version) -> sha1
53
52
        self.checked_texts = {}
 
53
        self.checked_weaves = {}
54
54
 
55
55
    def check(self):
56
56
        self.branch.lock_read()
57
57
        self.progress = bzrlib.ui.ui_factory.progress_bar()
58
58
        try:
 
59
            self.progress.update('retrieving inventory', 0, 0)
 
60
            # do not put in init, as it should be done with progess,
 
61
            # and inside the lock.
 
62
            self.inventory_weave = self.branch._get_inventory_weave()
59
63
            self.history = self.branch.revision_history()
60
64
            if not len(self.history):
61
65
                # nothing to see here
62
66
                return
63
 
            if not self.branch.revision_store.listable():
64
 
                raise BzrCheckError("Branch must be local")
65
 
            self.planned_revisions = set(self.branch.revision_store)
66
 
            inventoried = set(self.inventory_weave.names())
67
 
            awol = self.planned_revisions - inventoried
68
 
            if len(awol) > 0:
69
 
                raise BzrCheckError('Stored revisions missing from inventory'
70
 
                    '{%s}' % ','.join([f for f in awol]))
71
 
    
72
 
            for revno, rev_id in enumerate(self.planned_revisions):
73
 
                self.progress.update('checking revision', revno+1,
 
67
            self.plan_revisions()
 
68
            revno = 0
 
69
            self.check_weaves()
 
70
            while revno < len(self.planned_revisions):
 
71
                rev_id = self.planned_revisions[revno]
 
72
                self.progress.update('checking revision', revno,
74
73
                                     len(self.planned_revisions))
 
74
                revno += 1
75
75
                self.check_one_rev(rev_id)
76
76
        finally:
77
77
            self.progress.clear()
78
78
            self.branch.unlock()
79
79
 
 
80
    def plan_revisions(self):
 
81
        if not self.branch.revision_store.listable():
 
82
            self.planned_revisions = self.branch.get_ancestry(self.history[-1])
 
83
            self.planned_revisions.remove(None)
 
84
            # FIXME progress bars should support this more nicely.
 
85
            self.progress.clear()
 
86
            print ("Checking reachable history -"
 
87
                   " for a complete check use a local branch.")
 
88
            return
 
89
        
 
90
        self.planned_revisions = set(self.branch.revision_store)
 
91
        inventoried = set(self.inventory_weave.names())
 
92
        awol = self.planned_revisions - inventoried
 
93
        if len(awol) > 0:
 
94
            raise BzrCheckError('Stored revisions missing from inventory'
 
95
                '{%s}' % ','.join([f for f in awol]))
 
96
        self.planned_revisions = list(self.planned_revisions)
 
97
 
80
98
    def report_results(self, verbose):
81
99
        note('checked branch %s format %d',
82
100
             self.branch.base, 
85
103
        note('%6d revisions', self.checked_rev_cnt)
86
104
        note('%6d unique file texts', self.checked_text_cnt)
87
105
        note('%6d repeated file texts', self.repeated_text_cnt)
 
106
        note('%6d weaves', len(self.checked_weaves))
88
107
        if self.missing_inventory_sha_cnt:
89
108
            note('%6d revisions are missing inventory_sha1',
90
109
                 self.missing_inventory_sha_cnt)
146
165
                    missing_links = self.missing_parent_links.get(parent, [])
147
166
                    missing_links.append(rev_id)
148
167
                    self.missing_parent_links[parent] = missing_links
149
 
                    # list based so slow, TODO have a planned_revisions list and set.
 
168
                    # list based so somewhat slow,
 
169
                    # TODO have a planned_revisions list and set.
150
170
                    if self.branch.has_revision(parent):
151
171
                        missing_ancestry = self.branch.get_ancestry(parent)
152
172
                        for missing in missing_ancestry:
171
191
        self._check_revision_tree(rev_id)
172
192
        self.checked_rev_cnt += 1
173
193
 
 
194
    def check_weaves(self):
 
195
        """Check all the weaves we can get our hands on.
 
196
        """
 
197
        n_weaves = 1
 
198
        weave_ids = []
 
199
        if self.branch.weave_store.listable():
 
200
            weave_ids = list(self.branch.weave_store)
 
201
            n_weaves = len(weave_ids)
 
202
        self.progress.update('checking weave', 0, n_weaves)
 
203
        self.inventory_weave.check(progress_bar=self.progress)
 
204
        for i, weave_id in enumerate(weave_ids):
 
205
            self.progress.update('checking weave', i, n_weaves)
 
206
            w = self.branch.weave_store.get_weave(weave_id,
 
207
                    self.branch.get_transaction())
 
208
            # No progress here, because it looks ugly.
 
209
            w.check()
 
210
            self.checked_weaves[weave_id] = True
 
211
 
174
212
    def _check_revision_tree(self, rev_id):
175
213
        tree = self.branch.revision_tree(rev_id)
176
214
        inv = tree.inventory