← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Shannon Weyrick
  • Date: 2011-11-04 13:40:04 UTC
  • mfrom: (6238 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6256.
  • Revision ID: weyrick@mozek.us-20111104134004-033t2wqhc3ydzm0a
Merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
52
52
    ui,
53
53
    )
54
54
from bzrlib.branch import Branch
55
 
from bzrlib.bzrdir import BzrDir
 
55
from bzrlib.controldir import ControlDir
56
56
from bzrlib.revision import NULL_REVISION
57
57
from bzrlib.trace import note
58
58
from bzrlib.workingtree import WorkingTree
386
386
    """
387
387
    try:
388
388
        base_tree, branch, repo, relpath = \
389
 
                        BzrDir.open_containing_tree_branch_or_repository(path)
 
389
                        ControlDir.open_containing_tree_branch_or_repository(path)
390
390
    except errors.NotBranchError:
391
391
        base_tree = branch = repo = None
392
392