← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/check.py

  • Committer: Tarmac
  • Author(s): Vincent Ladeuil
  • Date: 2017-01-30 14:42:05 UTC
  • mfrom: (6620.1.1 trunk)
  • Revision ID: tarmac-20170130144205-r8fh2xpmiuxyozpv
Merge  2.7 into trunk including fix for bug #1657238 [r=vila]

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/check.py
47
47
  indicating that the revision was found/not found.
48
48
"""
49
49
 
 
50
from __future__ import absolute_import
 
51
 
50
52
from bzrlib import (
51
53
    errors,
52
54
    ui,
53
55
    )
54
56
from bzrlib.branch import Branch
55
 
from bzrlib.bzrdir import BzrDir
 
57
from bzrlib.controldir import ControlDir
56
58
from bzrlib.revision import NULL_REVISION
57
59
from bzrlib.trace import note
58
60
from bzrlib.workingtree import WorkingTree
386
388
    """
387
389
    try:
388
390
        base_tree, branch, repo, relpath = \
389
 
                        BzrDir.open_containing_tree_branch_or_repository(path)
 
391
                        ControlDir.open_containing_tree_branch_or_repository(path)
390
392
    except errors.NotBranchError:
391
393
        base_tree = branch = repo = None
392
394