← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Daniel Watkins
  • Date: 2008-07-03 07:06:24 UTC
  • mto: (3519.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3521.
  • Revision ID: d.m.watkins@warwick.ac.uk-20080703070624-ec2e2wpettstd7vu
Further tweaks as requested on-list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
39
39
from bzrlib.bzrdir import BzrDir
40
40
from bzrlib.errors import BzrCheckError
41
41
from bzrlib.repository import Repository
42
 
from bzrlib.symbol_versioning import deprecated_function, one_six
 
42
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
43
43
from bzrlib.trace import log_error, note
44
44
import bzrlib.ui
45
45
from bzrlib.workingtree import WorkingTree
241
241
            seen_names[path] = True
242
242
 
243
243
 
244
 
@deprecated_function(one_six)
 
244
@deprecated_function(deprecated_in((1,6,0)))
245
245
def check(branch, verbose):
246
246
    """Run consistency checks on a branch.
247
247
    
283
283
            # The branch is in a shared repository
284
284
            repo = branch.repository
285
285
        branches = [branch]
286
 
    else:
287
 
        if repo is not None:
288
 
            branches = repo.find_branches(using=True)
 
286
    elif repo is not None:
 
287
        branches = repo.find_branches(using=True)
289
288
 
290
289
    if repo is not None:
291
290
        repo.lock_read()