1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
# Copyright (C) 2005 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
from cStringIO import StringIO
import os
import sys
from bzrlib.tests import TestCaseWithMemoryTransport
from bzrlib.branch import Branch
from bzrlib.revision import is_ancestor
class TestAncestry(TestCaseWithMemoryTransport):
def assertAncestryEqual(self, expected, revision_id, branch):
"""Assert that the ancestry of revision_id in branch is as expected."""
ancestry = branch.repository.get_ancestry(revision_id)
self.assertEqual(expected, ancestry)
def test_straightline_ancestry(self):
"""Test ancestry file when just committing."""
tree = self.make_branch_and_memory_tree('.')
branch = tree.branch
tree.lock_write()
tree.add('')
rev_id_one = tree.commit('one')
rev_id_two = tree.commit('two', allow_pointless=True)
tree.unlock()
self.assertAncestryEqual([None, rev_id_one, rev_id_two],
rev_id_two, branch)
self.assertAncestryEqual([None, rev_id_one], rev_id_one, branch)
def test_none_is_always_an_ancestor(self):
tree = self.make_branch_and_memory_tree('.')
tree.lock_write()
tree.add('')
# note this is tested before any commits are done.
self.assertTrue(is_ancestor(None, None, tree.branch))
rev_id = tree.commit('one')
tree.unlock()
self.assertTrue(is_ancestor(None, None, tree.branch))
self.assertTrue(is_ancestor(rev_id, None, tree.branch))
self.assertFalse(is_ancestor(None, rev_id, tree.branch))
# TODO: check that ancestry is updated to include indirectly merged revisions
|