← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/smart/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/smart/branch.py
22
22
    errors,
23
23
    revision as _mod_revision,
24
24
    )
25
 
from bzrlib.bzrdir import BzrDir
 
25
from bzrlib.controldir import ControlDir
26
26
from bzrlib.smart.request import (
27
27
    FailedSmartServerResponse,
28
28
    SmartServerRequest,
46
46
        :return: A SmartServerResponse from self.do_with_branch().
47
47
        """
48
48
        transport = self.transport_from_client_path(path)
49
 
        bzrdir = BzrDir.open_from_transport(transport)
50
 
        if bzrdir.get_branch_reference() is not None:
 
49
        controldir = ControlDir.open_from_transport(transport)
 
50
        if controldir.get_branch_reference() is not None:
51
51
            raise errors.NotBranchError(transport.base)
52
 
        branch = bzrdir.open_branch(ignore_fallbacks=True)
 
52
        branch = controldir.open_branch(ignore_fallbacks=True)
53
53
        return self.do_with_branch(branch, *args)
54
54
 
55
55