1
# (C) 2005 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.selftest import TestCaseInTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
27
commit(br1, "Commit one", rev_id="a@u-0-0")
28
commit(br1, "Commit two", rev_id="a@u-0-1")
29
commit(br1, "Commit three", rev_id="a@u-0-2")
32
br2 = Branch("branch2", init=True)
33
br2.update_revisions(br1)
34
commit(br2, "Commit four", rev_id="b@u-0-3")
35
commit(br2, "Commit five", rev_id="b@u-0-4")
36
revisions_2 = br2.revision_history()
37
br1.add_pending_merge(revisions_2[4])
38
commit(br1, "Commit six", rev_id="a@u-0-3")
39
commit(br1, "Commit seven", rev_id="a@u-0-4")
40
commit(br2, "Commit eight", rev_id="b@u-0-5")
41
br1.add_pending_merge(br2.revision_history()[5])
42
commit(br1, "Commit nine", rev_id="a@u-0-5")
43
br2.add_pending_merge(br1.revision_history()[4])
44
commit(br2, "Commit ten", rev_id="b@u-0-6")
48
class TestIsAncestor(TestCaseInTempDir):
49
def test_is_ancestor(self):
50
"""Test checking whether a revision is an ancestor of another revision"""
51
from bzrlib.revision import is_ancestor, MultipleRevisionSources
52
from bzrlib.errors import NoSuchRevision
53
br1, br2 = make_branches()
54
revisions = br1.revision_history()
55
revisions_2 = br2.revision_history()
56
sources = MultipleRevisionSources(br1, br2)
58
assert is_ancestor(revisions[0], revisions[0], sources)
59
assert is_ancestor(revisions[1], revisions[0], sources)
60
assert not is_ancestor(revisions[0], revisions[1], sources)
61
assert is_ancestor(revisions_2[3], revisions[0], sources)
62
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
64
assert is_ancestor(revisions[3], revisions_2[4], sources)
65
assert is_ancestor(revisions[3], revisions_2[4], br1)
66
assert is_ancestor(revisions[3], revisions_2[3], sources)
67
assert not is_ancestor(revisions[3], revisions_2[3], br1)
69
class TestIntermediateRevisions(TestCaseInTempDir):
72
from bzrlib.commit import commit
73
TestCaseInTempDir.setUp(self)
74
self.br1, self.br2 = make_branches()
75
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
76
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
77
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
78
self.br1.add_pending_merge(self.br2.revision_history()[6])
79
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
80
self.br2.add_pending_merge(self.br1.revision_history()[6])
81
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
83
from bzrlib.revision import MultipleRevisionSources
84
self.sources = MultipleRevisionSources(self.br1, self.br2)
86
def intervene(self, ancestor, revision, revision_history=None):
87
from bzrlib.revision import get_intervening_revisions
88
return get_intervening_revisions(ancestor,revision, self.sources,
91
def test_intervene(self):
92
"""Find intermediate revisions, without requiring history"""
93
from bzrlib.errors import NotAncestor, NoSuchRevision
94
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
95
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
96
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
97
['a@u-0-1', 'a@u-0-2'])
98
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
99
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
100
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
101
['b@u-0-4', 'a@u-0-3'])
102
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
103
self.br1.revision_history()),
105
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
106
self.br1.revision_history()),
107
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
109
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
110
self.br1.revision_history()),
111
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
113
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
114
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
116
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
117
self.br2.revision_history()),
118
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
119
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
120
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
121
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
122
self.br2.revision_history()),
123
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
124
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
125
self.br2.revision_history())
126
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
127
'b@u-0-6', self.br2.revision_history())
128
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
129
'c@u-0-6', self.br2.revision_history())
132
class TestCommonAncestor(TestCaseInTempDir):
133
"""Test checking whether a revision is an ancestor of another revision"""
135
def test_old_common_ancestor(self):
136
"""Pick a resonable merge base using the old functionality"""
137
from bzrlib.revision import find_present_ancestors
138
from bzrlib.revision import old_common_ancestor as common_ancestor
139
from bzrlib.revision import MultipleRevisionSources
140
br1, br2 = make_branches()
141
revisions = br1.revision_history()
142
revisions_2 = br2.revision_history()
143
sources = MultipleRevisionSources(br1, br2)
145
expected_ancestors_list = {revisions[3]:(0, 0),
147
revisions_2[4]:(2, 1),
149
revisions_2[3]:(4, 2),
150
revisions[0]:(5, 3) }
151
ancestors_list = find_present_ancestors(revisions[3], sources)
152
assert len(expected_ancestors_list) == len(ancestors_list)
153
for key, value in expected_ancestors_list.iteritems():
154
self.assertEqual(ancestors_list[key], value,
155
"key %r, %r != %r" % (key, ancestors_list[key],
158
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
160
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
162
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
164
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
166
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
168
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
170
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
172
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
175
def test_common_ancestor(self):
176
"""Pick a reasonable merge base"""
177
from bzrlib.revision import find_present_ancestors
178
from bzrlib.revision import common_ancestor
179
from bzrlib.revision import MultipleRevisionSources
180
br1, br2 = make_branches()
181
revisions = br1.revision_history()
182
revisions_2 = br2.revision_history()
183
sources = MultipleRevisionSources(br1, br2)
185
expected_ancestors_list = {revisions[3]:(0, 0),
187
revisions_2[4]:(2, 1),
189
revisions_2[3]:(4, 2),
190
revisions[0]:(5, 3) }
191
ancestors_list = find_present_ancestors(revisions[3], sources)
192
assert len(expected_ancestors_list) == len(ancestors_list)
193
for key, value in expected_ancestors_list.iteritems():
194
self.assertEqual(ancestors_list[key], value,
195
"key %r, %r != %r" % (key, ancestors_list[key],
198
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
200
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
202
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
204
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
206
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
208
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
210
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
212
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
added
removed
bzrlib/selftest/testrevision.py
