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
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
|
# (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 bzrlib.selftest import FunctionalTestCase
def make_branches():
from bzrlib.branch import Branch
from bzrlib.commit import commit
from bzrlib.revision import validate_revision_id
import os
os.mkdir("branch1")
br1 = Branch("branch1", init=True)
commit(br1, "Commit one", rev_id="a@u-0-0")
commit(br1, "Commit two", rev_id="a@u-0-1")
commit(br1, "Commit three", rev_id="a@u-0-2")
os.mkdir("branch2")
br2 = Branch("branch2", init=True)
br2.update_revisions(br1)
commit(br2, "Commit four", rev_id="b@u-0-3")
commit(br2, "Commit five", rev_id="b@u-0-4")
revisions_2 = br2.revision_history()
br1.add_pending_merge(revisions_2[4])
commit(br1, "Commit six", rev_id="a@u-0-3")
commit(br1, "Commit seven", rev_id="a@u-0-4")
commit(br2, "Commit eight", rev_id="b@u-0-5")
br1.add_pending_merge(br2.revision_history()[5])
commit(br1, "Commit nine", rev_id="a@u-0-5")
br2.add_pending_merge(br1.revision_history()[4])
commit(br2, "Commit ten", rev_id="b@u-0-6")
return br1, br2
class TestIsAncestor(FunctionalTestCase):
def test_is_ancestor(self):
"""Test checking whether a revision is an ancestor of another revision"""
from bzrlib.revision import is_ancestor, MultipleRevisionSources
from bzrlib.errors import NoSuchRevision
br1, br2 = make_branches()
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
sources = MultipleRevisionSources(br1, br2)
assert is_ancestor(revisions[0], revisions[0], sources)
assert is_ancestor(revisions[1], revisions[0], sources)
assert not is_ancestor(revisions[0], revisions[1], sources)
assert is_ancestor(revisions_2[3], revisions[0], sources)
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
revisions[0], br1)
assert is_ancestor(revisions[3], revisions_2[4], sources)
assert is_ancestor(revisions[3], revisions_2[4], br1)
assert is_ancestor(revisions[3], revisions_2[3], sources)
assert not is_ancestor(revisions[3], revisions_2[3], br1)
class TestCommonAncestor(FunctionalTestCase):
"""Test checking whether a revision is an ancestor of another revision"""
def test_common_ancestor(self):
from bzrlib.revision import find_present_ancestors, common_ancestor
from bzrlib.revision import MultipleRevisionSources
br1, br2 = make_branches()
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
sources = MultipleRevisionSources(br1, br2)
expected_ancestors_list = {revisions[3]:(0, 0),
revisions[2]:(1, 1),
revisions_2[4]:(2, 1),
revisions[1]:(3, 2),
revisions_2[3]:(4, 2),
revisions[0]:(5, 3) }
ancestors_list = find_present_ancestors(revisions[3], sources)
assert len(expected_ancestors_list) == len(ancestors_list)
for key, value in expected_ancestors_list.iteritems():
self.assertEqual(ancestors_list[key], value,
"key %r, %r != %r" % (key, ancestors_list[key],
value))
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
revisions[0])
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
revisions[2])
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
revisions[4])
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
revisions_2[5])
|