← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2012-04-02 01:44:26 UTC
  • mfrom: (6518 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6519.
  • Revision ID: jelmer@samba.org-20120402014426-0o5qtysohyl006b2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_push.py
22
22
from bzrlib import (
23
23
    branch,
24
24
    builtins,
25
 
    bzrdir,
 
25
    controldir,
26
26
    check,
27
27
    errors,
28
28
    memorytree,
57
57
        # result object contains some structured data
58
58
        self.assertEqual(result.old_revid, 'M1')
59
59
        self.assertEqual(result.new_revid, 'P2')
60
 
        # and it can be treated as an integer for compatibility
61
 
        self.assertEqual(self.applyDeprecated(
62
 
            symbol_versioning.deprecated_in((2, 3, 0)),
63
 
            result.__int__),
64
 
            0)
65
60
 
66
61
    def test_push_merged_indirect(self):
67
62
        # it should be possible to do a push from one branch into another
173
168
            if self.vfs_transport_factory is test_server.LocalURLServer:
174
169
                # the branch is colocated on disk, we cannot create a checkout.
175
170
                # hopefully callers will expect this.
176
 
                local_controldir= bzrdir.BzrDir.open(
 
171
                local_controldir = controldir.ControlDir.open(
177
172
                    self.get_vfs_only_url('repo/tree'))
178
173
                tree = local_controldir.create_workingtree()
179
174
            else:
355
350
            # remotebranches can't be bound.  Let's instead make a new local
356
351
            # branch of the default type, which does allow binding.
357
352
            # See https://bugs.launchpad.net/bzr/+bug/112020
358
 
            local = bzrdir.BzrDir.create_branch_convenience('local2')
 
353
            local = controldir.ControlDir.create_branch_convenience('local2')
359
354
            local.bind(target)
360
355
        source = self.make_branch('source')
361
356
        branch.Branch.hooks.install_named_hook(