← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Vincent Ladeuil
  • Date: 2010-10-15 12:35:00 UTC
  • mto: This revision was merged to the branch mainline in revision 5502.
  • Revision ID: v.ladeuil+lp@free.fr-20101015123500-iyqj7e0r62ie6qfy
Unbreak pqm by commenting out the bogus use of doctest +SKIP not supported by python2.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
46
46
  indicating that the revision was found/not found.
47
47
"""
48
48
 
49
 
from bzrlib import (
50
 
    errors,
51
 
    ui,
52
 
    )
 
49
from bzrlib import errors
53
50
from bzrlib.branch import Branch
54
51
from bzrlib.bzrdir import BzrDir
55
52
from bzrlib.revision import NULL_REVISION
56
53
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
57
54
from bzrlib.trace import note
 
55
import bzrlib.ui
58
56
from bzrlib.workingtree import WorkingTree
59
57
 
60
58
class Check(object):
90
88
        if callback_refs is None:
91
89
            callback_refs = {}
92
90
        self.repository.lock_read()
93
 
        self.progress = ui.ui_factory.nested_progress_bar()
 
91
        self.progress = bzrlib.ui.ui_factory.nested_progress_bar()
94
92
        try:
95
93
            self.progress.update('check', 0, 4)
96
94
            if self.check_repo:
172
170
        # - we can fill out existence flags at this point
173
171
        # - we can read the revision inventory sha at this point
174
172
        # - we can check properties and serialisers etc.
175
 
        if not self.repository._format.revision_graph_can_have_wrong_parents:
 
173
        if not self.repository.revision_graph_can_have_wrong_parents():
176
174
            # The check against the index isn't needed.
177
175
            self.revs_with_bad_parents_in_index = None
178
176
            for thing in revision_iterator:
289
287
        """Check all the weaves we can get our hands on.
290
288
        """
291
289
        weave_ids = []
292
 
        storebar = ui.ui_factory.nested_progress_bar()
 
290
        storebar = bzrlib.ui.ui_factory.nested_progress_bar()
293
291
        try:
294
292
            self._check_weaves(storebar)
295
293
        finally:
330
328
            self.text_key_references[key] = True
331
329
 
332
330
 
 
331
@deprecated_function(deprecated_in((1,6,0)))
 
332
def check(branch, verbose):
 
333
    """Run consistency checks on a branch.
 
334
 
 
335
    Results are reported through logging.
 
336
 
 
337
    Deprecated in 1.6.  Please use check_dwim instead.
 
338
 
 
339
    :raise BzrCheckError: if there's a consistency error.
 
340
    """
 
341
    check_branch(branch, verbose)
 
342
 
 
343
 
 
344
@deprecated_function(deprecated_in((1,16,0)))
 
345
def check_branch(branch, verbose):
 
346
    """Run consistency checks on a branch.
 
347
 
 
348
    Results are reported through logging.
 
349
 
 
350
    :raise BzrCheckError: if there's a consistency error.
 
351
    """
 
352
    branch.lock_read()
 
353
    try:
 
354
        needed_refs = {}
 
355
        for ref in branch._get_check_refs():
 
356
            needed_refs.setdefault(ref, []).append(branch)
 
357
        result = branch.repository.check([branch.last_revision()], needed_refs)
 
358
        branch_result = result.other_results[0]
 
359
    finally:
 
360
        branch.unlock()
 
361
    branch_result.report_results(verbose)
 
362
 
 
363
 
333
364
def scan_branch(branch, needed_refs, to_unlock):
334
365
    """Scan a branch for refs.
335
366