← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_branch/test_branch.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_branch.py
18
18
 
19
19
from bzrlib import (
20
20
    branch as _mod_branch,
21
 
    bzrdir,
 
21
    controldir,
22
22
    config,
23
23
    delta as _mod_delta,
24
24
    errors,
475
475
        checkout = source_branch.create_checkout('c')
476
476
        self.assertEqual(rev_id, checkout.last_revision())
477
477
 
478
 
    def test_set_revision_history(self):
479
 
        tree = self.make_branch_and_tree('a')
480
 
        tree.commit('a commit', rev_id='rev1')
481
 
        br = tree.branch
482
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
483
 
            br.set_revision_history, ["rev1"])
484
 
        self.assertEquals(br.last_revision(), "rev1")
485
 
        self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
486
 
            br.set_revision_history, [])
487
 
        self.assertEquals(br.last_revision(), 'null:')
488
 
 
489
478
    def test_heads_to_fetch(self):
490
479
        # heads_to_fetch is a method that returns a collection of revids that
491
480
        # need to be fetched to copy this branch into another repo.  At a
708
697
        self.assertIsInstance(made_branch, _mod_branch.Branch)
709
698
 
710
699
        # find it via bzrdir opening:
711
 
        opened_control = bzrdir.BzrDir.open(readonly_t.base)
 
700
        opened_control = controldir.ControlDir.open(readonly_t.base)
712
701
        direct_opened_branch = opened_control.open_branch()
713
702
        self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
714
703
        self.assertEqual(opened_control, direct_opened_branch.bzrdir)
849
838
    def test_fallbacks_not_opened(self):
850
839
        stacked = self.make_branch_with_fallback()
851
840
        self.get_transport('').rename('fallback', 'moved')
852
 
        reopened_dir = bzrdir.BzrDir.open(stacked.base)
 
841
        reopened_dir = controldir.ControlDir.open(stacked.base)
853
842
        reopened = reopened_dir.open_branch(ignore_fallbacks=True)
854
843
        self.assertEqual([], reopened.repository._fallback_repositories)
855
844
 
856
845
    def test_fallbacks_are_opened(self):
857
846
        stacked = self.make_branch_with_fallback()
858
 
        reopened_dir = bzrdir.BzrDir.open(stacked.base)
 
847
        reopened_dir = controldir.ControlDir.open(stacked.base)
859
848
        reopened = reopened_dir.open_branch(ignore_fallbacks=False)
860
849
        self.assertLength(1, reopened.repository._fallback_repositories)
861
850