← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interbranch/test_push.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-08 18:30:33 UTC
  • mfrom: (6487 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6488.
  • Revision ID: v.ladeuil+lp@free.fr-20120308183033-bccqnbr1tpozs711
Merge bzr.dev resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interbranch/test_push.py
25
25
 
26
26
from bzrlib import (
27
27
    branch,
28
 
    bzrdir,
29
28
    check,
 
29
    controldir,
30
30
    errors,
31
31
    push,
32
32
    symbol_versioning,
34
34
    vf_repository,
35
35
    )
36
36
from bzrlib.branch import Branch
37
 
from bzrlib.bzrdir import BzrDir
 
37
from bzrlib.controldir import ControlDir
38
38
from bzrlib.memorytree import MemoryTree
39
39
from bzrlib.revision import NULL_REVISION
40
40
from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
165
165
            if self.vfs_transport_factory is test_server.LocalURLServer:
166
166
                # the branch is colocated on disk, we cannot create a checkout.
167
167
                # hopefully callers will expect this.
168
 
                local_controldir = bzrdir.BzrDir.open(self.get_vfs_only_url('repo/tree'))
 
168
                local_controldir = controldir.ControlDir.open(self.get_vfs_only_url('repo/tree'))
169
169
                tree = local_controldir.create_workingtree()
170
170
            else:
171
171
                tree = a_branch.create_checkout('repo/tree', lightweight=True)
349
349
            # remotebranches can't be bound.  Let's instead make a new local
350
350
            # branch of the default type, which does allow binding.
351
351
            # See https://bugs.launchpad.net/bzr/+bug/112020
352
 
            local = BzrDir.create_branch_convenience('local2')
 
352
            local = ControlDir.create_branch_convenience('local2')
353
353
            local.bind(target)
354
354
        source = self.make_from_branch('source')
355
355
        Branch.hooks.install_named_hook('post_push',