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.tests import TestCaseWithTransport
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
29
# XXX: Make this a method of a merge base case
30
def make_branches(self):
31
"""Create two branches
33
branch 1 has 6 commits, branch 2 has 3 commits
34
commit 10 was a psuedo merge from branch 1
35
but has been disabled until ghost support is
48
so A is missing b6 at the start
49
and B is missing a3, a4, a5
51
tree1 = self.make_branch_and_tree("branch1")
54
tree1.commit("Commit one", rev_id="a@u-0-0")
55
tree1.commit("Commit two", rev_id="a@u-0-1")
56
tree1.commit("Commit three", rev_id="a@u-0-2")
58
tree2 = self.make_branch_and_tree("branch2")
60
br2.update_revisions(br1)
61
tree2.commit("Commit four", rev_id="b@u-0-3")
62
tree2.commit("Commit five", rev_id="b@u-0-4")
63
revisions_2 = br2.revision_history()
65
fetch(from_branch=br2, to_branch=br1)
66
tree1.add_pending_merge(revisions_2[4])
67
self.assertEquals(revisions_2[4], 'b@u-0-4')
68
tree1.commit("Commit six", rev_id="a@u-0-3")
69
tree1.commit("Commit seven", rev_id="a@u-0-4")
70
tree2.commit("Commit eight", rev_id="b@u-0-5")
72
fetch(from_branch=br2, to_branch=br1)
73
tree1.add_pending_merge(br2.revision_history()[5])
74
tree1.commit("Commit nine", rev_id="a@u-0-5")
75
# DO NOT FETCH HERE - we WANT a GHOST.
76
#fetch(from_branch=br1, to_branch=br2)
77
tree2.add_pending_merge(br1.revision_history()[4])
78
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
83
class TestIsAncestor(TestCaseWithTransport):
85
def test_recorded_ancestry(self):
86
"""Test that commit records all ancestors"""
87
br1, br2 = make_branches(self)
88
d = [('a@u-0-0', ['a@u-0-0']),
89
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
90
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
91
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
92
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
94
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
96
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
97
'a@u-0-3', 'a@u-0-4']),
98
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
100
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
101
'b@u-0-3', 'b@u-0-4',
102
'b@u-0-5', 'a@u-0-5']),
103
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
104
'b@u-0-3', 'b@u-0-4',
105
'b@u-0-5', 'b@u-0-6']),
107
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
108
br2_only = ('b@u-0-6',)
109
for branch in br1, br2:
110
for rev_id, anc in d:
111
if rev_id in br1_only and not branch is br1:
113
if rev_id in br2_only and not branch is br2:
115
mutter('ancestry of {%s}: %r',
116
rev_id, branch.repository.get_ancestry(rev_id))
117
result = sorted(branch.repository.get_ancestry(rev_id))
118
self.assertEquals(result, [None] + sorted(anc))
121
def test_is_ancestor(self):
122
"""Test checking whether a revision is an ancestor of another revision"""
123
br1, br2 = make_branches(self)
124
revisions = br1.revision_history()
125
revisions_2 = br2.revision_history()
128
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
129
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
130
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
131
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
132
# disabled mbp 20050914, doesn't seem to happen anymore
133
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
134
## revisions[0], br1)
135
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
136
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
137
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
138
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
141
class TestIntermediateRevisions(TestCaseWithTransport):
144
from bzrlib.commit import commit
145
TestCaseWithTransport.setUp(self)
146
self.br1, self.br2 = make_branches(self)
148
self.br2.working_tree().commit("Commit eleven", rev_id="b@u-0-7")
149
self.br2.working_tree().commit("Commit twelve", rev_id="b@u-0-8")
150
self.br2.working_tree().commit("Commit thirtteen", rev_id="b@u-0-9")
152
fetch(from_branch=self.br2, to_branch=self.br1)
153
self.br1.working_tree().add_pending_merge(self.br2.revision_history()[6])
154
self.br1.working_tree().commit("Commit fourtten", rev_id="a@u-0-6")
156
fetch(from_branch=self.br1, to_branch=self.br2)
157
self.br2.working_tree().add_pending_merge(self.br1.revision_history()[6])
158
self.br2.working_tree().commit("Commit fifteen", rev_id="b@u-0-10")
160
from bzrlib.revision import MultipleRevisionSources
161
self.sources = MultipleRevisionSources(self.br1.repository,
164
def intervene(self, ancestor, revision, revision_history=None):
165
from bzrlib.revision import get_intervening_revisions
166
return get_intervening_revisions(ancestor,revision, self.sources,
169
def test_intervene(self):
170
"""Find intermediate revisions, without requiring history"""
171
from bzrlib.errors import NotAncestor, NoSuchRevision
172
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
173
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
174
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
175
['a@u-0-1', 'a@u-0-2'])
176
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
177
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
178
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
179
['b@u-0-4', 'a@u-0-3'])
180
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
181
self.br1.revision_history()),
183
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
184
self.br1.revision_history()),
185
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
187
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
188
self.br1.revision_history()),
189
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
191
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
192
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
194
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
195
self.br2.revision_history()),
196
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
197
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
198
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
199
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
200
self.br2.revision_history()),
201
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
202
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
203
self.br2.revision_history())
204
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
205
'b@u-0-6', self.br2.revision_history())
206
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
207
'c@u-0-6', self.br2.revision_history())
210
class TestCommonAncestor(TestCaseWithTransport):
211
"""Test checking whether a revision is an ancestor of another revision"""
213
def test_old_common_ancestor(self):
214
"""Pick a resonable merge base using the old functionality"""
215
from bzrlib.revision import old_common_ancestor as common_ancestor
216
br1, br2 = make_branches(self)
217
revisions = br1.revision_history()
218
revisions_2 = br2.revision_history()
219
sources = br1.repository
221
expected_ancestors_list = {revisions[3]:(0, 0),
223
revisions_2[4]:(2, 1),
225
revisions_2[3]:(4, 2),
226
revisions[0]:(5, 3) }
227
ancestors_list = find_present_ancestors(revisions[3], sources)
228
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
229
for key, value in expected_ancestors_list.iteritems():
230
self.assertEqual(ancestors_list[key], value,
231
"key %r, %r != %r" % (key, ancestors_list[key],
234
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
236
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
238
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
240
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
242
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
244
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
246
fetch(from_branch=br2, to_branch=br1)
247
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
248
revisions[4]) # revisions_2[5] is equally valid
249
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
252
def test_common_ancestor(self):
253
"""Pick a reasonable merge base"""
254
from bzrlib.revision import common_ancestor
255
br1, br2 = make_branches(self)
256
revisions = br1.revision_history()
257
revisions_2 = br2.revision_history()
258
sources = MultipleRevisionSources(br1.repository, br2.repository)
259
expected_ancestors_list = {revisions[3]:(0, 0),
261
revisions_2[4]:(2, 1),
263
revisions_2[3]:(4, 2),
264
revisions[0]:(5, 3) }
265
ancestors_list = find_present_ancestors(revisions[3], sources)
266
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
267
for key, value in expected_ancestors_list.iteritems():
268
self.assertEqual(ancestors_list[key], value,
269
"key %r, %r != %r" % (key, ancestors_list[key],
271
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
273
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
275
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
277
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
279
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
281
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
283
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
284
revisions[4]) # revisions_2[5] is equally valid
285
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
286
revisions[4]) # revisions_2[5] is equally valid
288
def test_combined(self):
290
Ensure it's not order-sensitive
292
br1, br2 = make_branches(self)
293
source = MultipleRevisionSources(br1.repository, br2.repository)
294
combined_1 = combined_graph(br1.last_revision(),
295
br2.last_revision(), source)
296
combined_2 = combined_graph(br2.last_revision(),
297
br1.last_revision(), source)
298
self.assertEquals(combined_1[1], combined_2[1])
299
self.assertEquals(combined_1[2], combined_2[2])
300
self.assertEquals(combined_1[3], combined_2[3])
301
self.assertEquals(combined_1, combined_2)
added
removed
bzrlib/tests/test_revision.py
