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
20
from bzrlib.selftest import TestCaseInTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
23
from bzrlib.fetch import fetch
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
is_ancestor, MultipleRevisionSources)
26
from bzrlib.trace import mutter
27
from bzrlib.errors import NoSuchRevision
30
"""Create two branches
32
branch 1 has 6 commits, branch 2 has 3 commits
33
commit 10 was a psuedo merge from branch 1
34
but has been disabled until ghost support is
47
so A is missing b6 at the start
48
and B is missing a3, a4, a5
51
br1 = Branch.initialize("branch1")
53
commit(br1, "Commit one", rev_id="a@u-0-0")
54
commit(br1, "Commit two", rev_id="a@u-0-1")
55
commit(br1, "Commit three", rev_id="a@u-0-2")
58
br2 = Branch.initialize("branch2")
59
br2.update_revisions(br1)
60
commit(br2, "Commit four", rev_id="b@u-0-3")
61
commit(br2, "Commit five", rev_id="b@u-0-4")
62
revisions_2 = br2.revision_history()
64
fetch(from_branch=br2, to_branch=br1)
65
br1.add_pending_merge(revisions_2[4])
66
assert revisions_2[4] == 'b@u-0-4'
67
commit(br1, "Commit six", rev_id="a@u-0-3")
68
commit(br1, "Commit seven", rev_id="a@u-0-4")
69
commit(br2, "Commit eight", rev_id="b@u-0-5")
71
fetch(from_branch=br2, to_branch=br1)
72
br1.add_pending_merge(br2.revision_history()[5])
73
commit(br1, "Commit nine", rev_id="a@u-0-5")
74
# DO NOT FETCH HERE - we WANT a GHOST.
75
#fetch(from_branch=br1, to_branch=br2)
76
br2.add_pending_merge(br1.revision_history()[4])
77
commit(br2, "Commit ten - ghost merge", rev_id="b@u-0-6")
82
class TestIsAncestor(TestCaseInTempDir):
83
def test_recorded_ancestry(self):
84
"""Test that commit records all ancestors"""
85
br1, br2 = make_branches()
86
d = [('a@u-0-0', ['a@u-0-0']),
87
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
88
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
89
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
90
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
92
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
94
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
95
'a@u-0-3', 'a@u-0-4']),
96
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
98
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
100
'b@u-0-5', 'a@u-0-5']),
101
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
102
'b@u-0-3', 'b@u-0-4',
103
'b@u-0-5', 'b@u-0-6']),
105
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
106
br2_only = ('b@u-0-6',)
107
for branch in br1, br2:
108
for rev_id, anc in d:
109
if rev_id in br1_only and not branch is br1:
111
if rev_id in br2_only and not branch is br2:
113
mutter('ancestry of {%s}: %r',
114
rev_id, branch.get_ancestry(rev_id))
115
self.assertEquals(sorted(branch.get_ancestry(rev_id)),
116
[None] + sorted(anc))
119
def test_is_ancestor(self):
120
"""Test checking whether a revision is an ancestor of another revision"""
121
br1, br2 = make_branches()
122
revisions = br1.revision_history()
123
revisions_2 = br2.revision_history()
126
assert is_ancestor(revisions[0], revisions[0], br1)
127
assert is_ancestor(revisions[1], revisions[0], sources)
128
assert not is_ancestor(revisions[0], revisions[1], sources)
129
assert is_ancestor(revisions_2[3], revisions[0], sources)
130
# disabled mbp 20050914, doesn't seem to happen anymore
131
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
132
## revisions[0], br1)
133
assert is_ancestor(revisions[3], revisions_2[4], sources)
134
assert is_ancestor(revisions[3], revisions_2[4], br1)
135
assert is_ancestor(revisions[3], revisions_2[3], sources)
136
## assert not is_ancestor(revisions[3], revisions_2[3], br1)
139
class TestIntermediateRevisions(TestCaseInTempDir):
142
from bzrlib.commit import commit
143
TestCaseInTempDir.setUp(self)
144
self.br1, self.br2 = make_branches()
146
self.br2.commit("Commit eleven", rev_id="b@u-0-7")
147
self.br2.commit("Commit twelve", rev_id="b@u-0-8")
148
self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
150
fetch(from_branch=self.br2, to_branch=self.br1)
151
self.br1.add_pending_merge(self.br2.revision_history()[6])
152
self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
154
fetch(from_branch=self.br1, to_branch=self.br2)
155
self.br2.add_pending_merge(self.br1.revision_history()[6])
156
self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
158
from bzrlib.revision import MultipleRevisionSources
159
self.sources = MultipleRevisionSources(self.br1, self.br2)
161
def intervene(self, ancestor, revision, revision_history=None):
162
from bzrlib.revision import get_intervening_revisions
163
return get_intervening_revisions(ancestor,revision, self.sources,
166
def test_intervene(self):
167
"""Find intermediate revisions, without requiring history"""
168
from bzrlib.errors import NotAncestor, NoSuchRevision
169
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
170
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
171
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
172
['a@u-0-1', 'a@u-0-2'])
173
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
174
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
175
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
176
['b@u-0-4', 'a@u-0-3'])
177
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
178
self.br1.revision_history()),
180
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
181
self.br1.revision_history()),
182
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
184
print ("testrevision.py 191 - intervene appears to return b..6 even"
185
"though it is not reachable!")
186
# self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
187
# self.br1.revision_history()),
188
# ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
190
# self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
191
# ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
193
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
194
self.br2.revision_history()),
195
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
196
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
197
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
198
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
199
self.br2.revision_history()),
200
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
201
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
202
self.br2.revision_history())
203
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
204
'b@u-0-6', self.br2.revision_history())
205
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
206
'c@u-0-6', self.br2.revision_history())
209
class TestCommonAncestor(TestCaseInTempDir):
210
"""Test checking whether a revision is an ancestor of another revision"""
212
def test_old_common_ancestor(self):
213
"""Pick a resonable merge base using the old functionality"""
214
from bzrlib.revision import old_common_ancestor as common_ancestor
215
br1, br2 = make_branches()
216
revisions = br1.revision_history()
217
revisions_2 = br2.revision_history()
220
expected_ancestors_list = {revisions[3]:(0, 0),
222
revisions_2[4]:(2, 1),
224
revisions_2[3]:(4, 2),
225
revisions[0]:(5, 3) }
226
ancestors_list = find_present_ancestors(revisions[3], sources)
227
assert len(expected_ancestors_list) == len(ancestors_list)
228
for key, value in expected_ancestors_list.iteritems():
229
self.assertEqual(ancestors_list[key], value,
230
"key %r, %r != %r" % (key, ancestors_list[key],
233
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
235
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
237
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
239
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
241
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
243
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
245
fetch(from_branch=br2, to_branch=br1)
246
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
247
revisions[4]) # revisions_2[5] is equally valid
248
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
251
def test_common_ancestor(self):
252
"""Pick a reasonable merge base"""
253
from bzrlib.revision import common_ancestor
254
br1, br2 = make_branches()
255
revisions = br1.revision_history()
256
revisions_2 = br2.revision_history()
257
sources = MultipleRevisionSources(br1, br2)
258
expected_ancestors_list = {revisions[3]:(0, 0),
260
revisions_2[4]:(2, 1),
262
revisions_2[3]:(4, 2),
263
revisions[0]:(5, 3) }
264
ancestors_list = find_present_ancestors(revisions[3], sources)
265
assert len(expected_ancestors_list) == len(ancestors_list)
266
for key, value in expected_ancestors_list.iteritems():
267
self.assertEqual(ancestors_list[key], value,
268
"key %r, %r != %r" % (key, ancestors_list[key],
270
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
272
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
274
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
276
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
278
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
280
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
282
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
283
revisions[4]) # revisions_2[5] is equally valid
284
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
285
revisions[4]) # revisions_2[5] is equally valid
287
def test_combined(self):
289
Ensure it's not order-sensitive
291
br1, br2 = make_branches()
292
source = MultipleRevisionSources(br1, br2)
293
combined_1 = combined_graph(br1.last_revision(),
294
br2.last_revision(), source)
295
combined_2 = combined_graph(br2.last_revision(),
296
br1.last_revision(), source)
297
assert combined_1[1] == combined_2[1]
298
assert combined_1[2] == combined_2[2]
299
assert combined_1[3] == combined_2[3]
300
assert combined_1 == combined_2
added
removed
bzrlib/selftest/testrevision.py
