35
34
def test_straightline_ancestry(self):
36
35
"""Test ancestry file when just committing."""
37
builder = BranchBuilder(self.get_transport())
38
rev_id_one = builder.build_commit()
39
rev_id_two = builder.build_commit()
40
branch = builder.get_branch()
36
tree = self.make_branch_and_memory_tree('.')
40
rev_id_one = tree.commit('one')
41
rev_id_two = tree.commit('two', allow_pointless=True)
41
44
self.assertAncestryEqual([None, rev_id_one, rev_id_two],
42
45
rev_id_two, branch)
43
46
self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
45
def test_none_is_ancestor_empty_branch(self):
46
branch = self.make_branch('.')
47
self.assertTrue(is_ancestor('null:', 'null:', branch))
49
def test_none_is_ancestor_non_empty_branch(self):
50
builder = BranchBuilder(self.get_transport())
51
rev_id = builder.build_commit()
52
branch = builder.get_branch()
53
self.assertTrue(is_ancestor('null:', 'null:', branch))
54
self.assertTrue(is_ancestor(rev_id, 'null:', branch))
55
self.assertFalse(is_ancestor('null:', rev_id, branch))
48
def test_none_is_always_an_ancestor(self):
49
tree = self.make_branch_and_memory_tree('.')
52
# note this is tested before any commits are done.
53
self.assertTrue(is_ancestor(None, None, tree.branch))
54
rev_id = tree.commit('one')
56
self.assertTrue(is_ancestor(None, None, tree.branch))
57
self.assertTrue(is_ancestor(rev_id, None, tree.branch))
58
self.assertFalse(is_ancestor(None, rev_id, tree.branch))
58
61
# TODO: check that ancestry is updated to include indirectly merged revisions
added
removed
bzrlib/tests/test_ancestry.py
