← 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: 2011-03-14 10:11:58 UTC
  • mfrom: (5609.24.1 2.3)
  • mto: (5609.24.2 2.3)
  • mto: This revision was merged to the branch mainline in revision 5723.
  • Revision ID: v.ladeuil+lp@free.fr-20110314101158-9ojis0ftsljg3c3t
Merge bzr/2.3

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 errors
 
49
from bzrlib import (
 
50
    errors,
 
51
    ui,
 
52
    )
50
53
from bzrlib.branch import Branch
51
54
from bzrlib.bzrdir import BzrDir
52
55
from bzrlib.revision import NULL_REVISION
53
56
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
54
57
from bzrlib.trace import note
55
 
import bzrlib.ui
56
58
from bzrlib.workingtree import WorkingTree
57
59
 
58
60
class Check(object):
88
90
        if callback_refs is None:
89
91
            callback_refs = {}
90
92
        self.repository.lock_read()
91
 
        self.progress = bzrlib.ui.ui_factory.nested_progress_bar()
 
93
        self.progress = ui.ui_factory.nested_progress_bar()
92
94
        try:
93
95
            self.progress.update('check', 0, 4)
94
96
            if self.check_repo:
287
289
        """Check all the weaves we can get our hands on.
288
290
        """
289
291
        weave_ids = []
290
 
        storebar = bzrlib.ui.ui_factory.nested_progress_bar()
 
292
        storebar = ui.ui_factory.nested_progress_bar()
291
293
        try:
292
294
            self._check_weaves(storebar)
293
295
        finally: