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.branch import Branch
21
from bzrlib.errors import NoSuchRevision
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.tests import TestCaseWithTransport
27
from bzrlib.trace import mutter
28
from bzrlib.workingtree import WorkingTree
30
# XXX: Make this a method of a merge base case
31
def make_branches(self):
32
"""Create two branches
34
branch 1 has 6 commits, branch 2 has 3 commits
35
commit 10 was a psuedo merge from branch 1
36
but has been disabled until ghost support is
49
so A is missing b6 at the start
50
and B is missing a3, a4, a5
52
tree1 = self.make_branch_and_tree("branch1")
55
tree1.commit("Commit one", rev_id="a@u-0-0")
56
tree1.commit("Commit two", rev_id="a@u-0-1")
57
tree1.commit("Commit three", rev_id="a@u-0-2")
59
tree2 = self.make_branch_and_tree("branch2")
61
br2.update_revisions(br1)
62
tree2.commit("Commit four", rev_id="b@u-0-3")
63
tree2.commit("Commit five", rev_id="b@u-0-4")
64
revisions_2 = br2.revision_history()
66
fetch(from_branch=br2, to_branch=br1)
67
tree1.add_pending_merge(revisions_2[4])
68
self.assertEquals(revisions_2[4], 'b@u-0-4')
69
tree1.commit("Commit six", rev_id="a@u-0-3")
70
tree1.commit("Commit seven", rev_id="a@u-0-4")
71
tree2.commit("Commit eight", rev_id="b@u-0-5")
73
fetch(from_branch=br2, to_branch=br1)
74
tree1.add_pending_merge(br2.revision_history()[5])
75
tree1.commit("Commit nine", rev_id="a@u-0-5")
76
# DO NOT FETCH HERE - we WANT a GHOST.
77
#fetch(from_branch=br1, to_branch=br2)
78
tree2.add_pending_merge(br1.revision_history()[4])
79
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
84
class TestIsAncestor(TestCaseWithTransport):
86
def test_recorded_ancestry(self):
87
"""Test that commit records all ancestors"""
88
br1, br2 = make_branches(self)
89
d = [('a@u-0-0', ['a@u-0-0']),
90
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
91
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
92
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
93
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
95
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
97
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
98
'a@u-0-3', 'a@u-0-4']),
99
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
101
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
102
'b@u-0-3', 'b@u-0-4',
103
'b@u-0-5', 'a@u-0-5']),
104
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
105
'b@u-0-3', 'b@u-0-4',
106
'b@u-0-5', 'b@u-0-6']),
108
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
109
br2_only = ('b@u-0-6',)
110
for branch in br1, br2:
111
for rev_id, anc in d:
112
if rev_id in br1_only and not branch is br1:
114
if rev_id in br2_only and not branch is br2:
116
mutter('ancestry of {%s}: %r',
117
rev_id, branch.repository.get_ancestry(rev_id))
118
result = sorted(branch.repository.get_ancestry(rev_id))
119
self.assertEquals(result, [None] + sorted(anc))
122
def test_is_ancestor(self):
123
"""Test checking whether a revision is an ancestor of another revision"""
124
br1, br2 = make_branches(self)
125
revisions = br1.revision_history()
126
revisions_2 = br2.revision_history()
129
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
130
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
131
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
132
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
133
# disabled mbp 20050914, doesn't seem to happen anymore
134
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
135
## revisions[0], br1)
136
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
137
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
138
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
139
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
142
class TestIntermediateRevisions(TestCaseWithTransport):
145
from bzrlib.commit import commit
146
TestCaseWithTransport.setUp(self)
147
self.br1, self.br2 = make_branches(self)
148
wt1 = self.br1.bzrdir.open_workingtree()
149
wt2 = self.br2.bzrdir.open_workingtree()
150
wt2.commit("Commit eleven", rev_id="b@u-0-7")
151
wt2.commit("Commit twelve", rev_id="b@u-0-8")
152
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
154
fetch(from_branch=self.br2, to_branch=self.br1)
155
wt1.add_pending_merge(self.br2.revision_history()[6])
156
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
158
fetch(from_branch=self.br1, to_branch=self.br2)
159
wt2.add_pending_merge(self.br1.revision_history()[6])
160
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
162
from bzrlib.revision import MultipleRevisionSources
163
self.sources = MultipleRevisionSources(self.br1.repository,
166
def intervene(self, ancestor, revision, revision_history=None):
167
from bzrlib.revision import get_intervening_revisions
168
return get_intervening_revisions(ancestor,revision, self.sources,
171
def test_intervene(self):
172
"""Find intermediate revisions, without requiring history"""
173
from bzrlib.errors import NotAncestor, NoSuchRevision
174
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
175
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
176
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
177
['a@u-0-1', 'a@u-0-2'])
178
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
179
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
180
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
181
['b@u-0-4', 'a@u-0-3'])
182
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
183
self.br1.revision_history()),
185
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
186
self.br1.revision_history()),
187
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
189
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
190
self.br1.revision_history()),
191
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
193
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
194
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
196
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
197
self.br2.revision_history()),
198
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
199
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
200
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
201
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
202
self.br2.revision_history()),
203
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
204
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
205
self.br2.revision_history())
206
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
207
'b@u-0-6', self.br2.revision_history())
208
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
209
'c@u-0-6', self.br2.revision_history())
212
class TestCommonAncestor(TestCaseWithTransport):
213
"""Test checking whether a revision is an ancestor of another revision"""
215
def test_old_common_ancestor(self):
216
"""Pick a resonable merge base using the old functionality"""
217
from bzrlib.revision import old_common_ancestor as common_ancestor
218
br1, br2 = make_branches(self)
219
revisions = br1.revision_history()
220
revisions_2 = br2.revision_history()
221
sources = br1.repository
223
expected_ancestors_list = {revisions[3]:(0, 0),
225
revisions_2[4]:(2, 1),
227
revisions_2[3]:(4, 2),
228
revisions[0]:(5, 3) }
229
ancestors_list = find_present_ancestors(revisions[3], sources)
230
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
231
for key, value in expected_ancestors_list.iteritems():
232
self.assertEqual(ancestors_list[key], value,
233
"key %r, %r != %r" % (key, ancestors_list[key],
236
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
238
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
240
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
242
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
244
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
246
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
248
fetch(from_branch=br2, to_branch=br1)
249
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
250
revisions[4]) # revisions_2[5] is equally valid
251
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
254
def test_common_ancestor(self):
255
"""Pick a reasonable merge base"""
256
from bzrlib.revision import common_ancestor
257
br1, br2 = make_branches(self)
258
revisions = br1.revision_history()
259
revisions_2 = br2.revision_history()
260
sources = MultipleRevisionSources(br1.repository, br2.repository)
261
expected_ancestors_list = {revisions[3]:(0, 0),
263
revisions_2[4]:(2, 1),
265
revisions_2[3]:(4, 2),
266
revisions[0]:(5, 3) }
267
ancestors_list = find_present_ancestors(revisions[3], sources)
268
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
269
for key, value in expected_ancestors_list.iteritems():
270
self.assertEqual(ancestors_list[key], value,
271
"key %r, %r != %r" % (key, ancestors_list[key],
273
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
275
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
277
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
279
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
281
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
283
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
285
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
286
revisions[4]) # revisions_2[5] is equally valid
287
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
288
revisions[4]) # revisions_2[5] is equally valid
290
def test_combined(self):
292
Ensure it's not order-sensitive
294
br1, br2 = make_branches(self)
295
source = MultipleRevisionSources(br1.repository, br2.repository)
296
combined_1 = combined_graph(br1.last_revision(),
297
br2.last_revision(), source)
298
combined_2 = combined_graph(br2.last_revision(),
299
br1.last_revision(), source)
300
self.assertEquals(combined_1[1], combined_2[1])
301
self.assertEquals(combined_1[2], combined_2[2])
302
self.assertEquals(combined_1[3], combined_2[3])
303
self.assertEquals(combined_1, combined_2)
305
def test_get_history(self):
306
# TODO: test ghosts on the left hand branch's impact
307
# TODO: test ghosts on all parents, we should get some
308
# indicator. i.e. NULL_REVISION
310
tree = self.make_branch_and_tree('.')
311
tree.commit('1', rev_id = '1', allow_pointless=True)
312
tree.commit('2', rev_id = '2', allow_pointless=True)
313
tree.commit('3', rev_id = '3', allow_pointless=True)
314
rev = tree.branch.repository.get_revision('1')
315
history = rev.get_history(tree.branch.repository)
316
self.assertEqual([None, '1'], history)
317
rev = tree.branch.repository.get_revision('2')
318
history = rev.get_history(tree.branch.repository)
319
self.assertEqual([None, '1', '2'], history)
320
rev = tree.branch.repository.get_revision('3')
321
history = rev.get_history(tree.branch.repository)
322
self.assertEqual([None, '1', '2' ,'3'], history)
added
removed
bzrlib/tests/test_revision.py
