← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_ancestry.py

Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_ancestry.py
22
22
from bzrlib.tests import TestCaseWithMemoryTransport
23
23
from bzrlib.branch import Branch
24
24
from bzrlib.branchbuilder import BranchBuilder
25
 
from bzrlib.revision import is_ancestor
26
 
from bzrlib.symbol_versioning import one_zero
27
25
 
28
26
 
29
27
class TestAncestry(TestCaseWithMemoryTransport):
43
41
            rev_id_two, branch)
44
42
        self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
45
43
 
46
 
    def test_none_is_ancestor_empty_branch(self):
47
 
        branch = self.make_branch('.')
48
 
        self.assertTrue(self.applyDeprecated(one_zero,
49
 
                        is_ancestor, 'null:', 'null:', branch))
50
 
 
51
 
    def test_none_is_ancestor_non_empty_branch(self):
52
 
        builder = BranchBuilder(self.get_transport())
53
 
        rev_id = builder.build_commit()
54
 
        branch = builder.get_branch()
55
 
        branch.lock_read()
56
 
        self.addCleanup(branch.unlock)
57
 
        self.assertTrue(self.applyDeprecated(one_zero,
58
 
                        is_ancestor, 'null:', 'null:', branch))
59
 
        self.assertTrue(self.applyDeprecated(one_zero,
60
 
                        is_ancestor, rev_id, 'null:',  branch))
61
 
        self.assertFalse(self.applyDeprecated(one_zero,
62
 
                         is_ancestor, 'null:', rev_id, branch))
63
 
 
64
 
 
65
44
# TODO: check that ancestry is updated to include indirectly merged revisions