14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17
from bzrlib.selftest import InTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
26
commit(br1, "Commit one")
27
commit(br1, "Commit two")
28
commit(br1, "Commit three")
31
br2 = Branch("branch2", init=True)
20
from bzrlib.branch import Branch
21
from bzrlib.errors import NoSuchRevision
22
from bzrlib.commit import commit
23
from bzrlib.graph import Graph
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
26
is_ancestor, MultipleRevisionSources)
27
from bzrlib.tests import TestCaseWithTransport
28
from bzrlib.trace import mutter
29
from bzrlib.workingtree import WorkingTree
31
# XXX: Make this a method of a merge base case
32
def make_branches(self):
33
"""Create two branches
35
branch 1 has 6 commits, branch 2 has 3 commits
36
commit 10 is a ghosted merge merge from branch 1
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")
32
60
br2.update_revisions(br1)
33
commit(br2, "Commit four")
34
commit(br2, "Commit five")
61
tree2.commit("Commit four", rev_id="b@u-0-3")
62
tree2.commit("Commit five", rev_id="b@u-0-4")
35
63
revisions_2 = br2.revision_history()
36
br1.add_pending_merge(revisions_2[4])
37
commit(br1, "Commit six")
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")
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.
77
tree2.add_pending_merge(br1.revision_history()[4])
78
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
41
class TestIsAncestor(InTempDir):
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)
147
wt1 = self.br1.bzrdir.open_workingtree()
148
wt2 = self.br2.bzrdir.open_workingtree()
149
wt2.commit("Commit eleven", rev_id="b@u-0-7")
150
wt2.commit("Commit twelve", rev_id="b@u-0-8")
151
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
153
self.br1.fetch(self.br2)
154
wt1.add_pending_merge(self.br2.revision_history()[6])
155
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
157
self.br2.fetch(self.br1)
158
wt2.add_pending_merge(self.br1.revision_history()[6])
159
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
161
from bzrlib.revision import MultipleRevisionSources
162
self.sources = MultipleRevisionSources(self.br1.repository,
165
def intervene(self, ancestor, revision, revision_history=None):
166
from bzrlib.revision import get_intervening_revisions
167
return get_intervening_revisions(ancestor,revision, self.sources,
170
def test_intervene(self):
171
"""Find intermediate revisions, without requiring history"""
172
from bzrlib.errors import NotAncestor, NoSuchRevision
173
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
174
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
175
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
176
['a@u-0-1', 'a@u-0-2'])
177
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
178
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
179
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
180
['b@u-0-4', 'a@u-0-3'])
181
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
182
self.br1.revision_history()),
184
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
185
self.br1.revision_history()),
186
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
188
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
189
self.br1.revision_history()),
190
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
192
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
193
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
195
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
196
self.br2.revision_history()),
197
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
198
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
199
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
200
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
201
self.br2.revision_history()),
202
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
203
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
204
self.br2.revision_history())
205
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
206
'b@u-0-6', self.br2.revision_history())
207
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
208
'c@u-0-6', self.br2.revision_history())
211
class MockRevisionSource(object):
212
"""A RevisionSource that takes a pregenerated graph.
214
This is useful for testing revision graph algorithms where
215
the actual branch existing is irrelevant.
218
def __init__(self, full_graph):
219
self._full_graph = full_graph
221
def get_revision_graph_with_ghosts(self, revision_ids):
222
# This is mocked out to just return a constant graph.
223
return self._full_graph
226
class TestCommonAncestor(TestCaseWithTransport):
42
227
"""Test checking whether a revision is an ancestor of another revision"""
44
from bzrlib.revision import is_ancestor, MultipleRevisionSources
45
from bzrlib.errors import NoSuchRevision
46
br1, br2 = make_branches()
229
def test_common_ancestor(self):
230
"""Pick a reasonable merge base"""
231
br1, br2 = make_branches(self)
47
232
revisions = br1.revision_history()
48
233
revisions_2 = br2.revision_history()
49
sources = MultipleRevisionSources(br1, br2)
51
assert is_ancestor(revisions[0], revisions[0], sources)
52
assert is_ancestor(revisions[1], revisions[0], sources)
53
assert not is_ancestor(revisions[0], revisions[1], sources)
54
assert is_ancestor(revisions_2[3], revisions[0], sources)
55
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
57
assert is_ancestor(revisions[3], revisions_2[4], sources)
58
assert is_ancestor(revisions[3], revisions_2[4], br1)
59
assert is_ancestor(revisions[3], revisions_2[3], sources)
60
assert not is_ancestor(revisions[3], revisions_2[3], br1)
234
sources = MultipleRevisionSources(br1.repository, br2.repository)
235
expected_ancestors_list = {revisions[3]:(0, 0),
237
revisions_2[4]:(2, 1),
239
revisions_2[3]:(4, 2),
240
revisions[0]:(5, 3) }
241
ancestors_list = find_present_ancestors(revisions[3], sources)
242
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
243
for key, value in expected_ancestors_list.iteritems():
244
self.assertEqual(ancestors_list[key], value,
245
"key %r, %r != %r" % (key, ancestors_list[key],
247
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
249
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
251
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
253
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
255
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
257
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
259
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
260
(revisions[4], revisions_2[5]))
261
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
262
(revisions[4], revisions_2[5]))
263
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
265
def test_combined(self):
267
Ensure it's not order-sensitive
269
br1, br2 = make_branches(self)
270
source = MultipleRevisionSources(br1.repository, br2.repository)
271
combined_1 = combined_graph(br1.last_revision(),
272
br2.last_revision(), source)
273
combined_2 = combined_graph(br2.last_revision(),
274
br1.last_revision(), source)
275
self.assertEquals(combined_1[1], combined_2[1])
276
self.assertEquals(combined_1[2], combined_2[2])
277
self.assertEquals(combined_1[3], combined_2[3])
278
self.assertEquals(combined_1, combined_2)
280
def test_get_history(self):
281
# TODO: test ghosts on the left hand branch's impact
282
# TODO: test ghosts on all parents, we should get some
283
# indicator. i.e. NULL_REVISION
285
tree = self.make_branch_and_tree('.')
286
tree.commit('1', rev_id = '1', allow_pointless=True)
287
tree.commit('2', rev_id = '2', allow_pointless=True)
288
tree.commit('3', rev_id = '3', allow_pointless=True)
289
rev = tree.branch.repository.get_revision('1')
290
history = rev.get_history(tree.branch.repository)
291
self.assertEqual([None, '1'], history)
292
rev = tree.branch.repository.get_revision('2')
293
history = rev.get_history(tree.branch.repository)
294
self.assertEqual([None, '1', '2'], history)
295
rev = tree.branch.repository.get_revision('3')
296
history = rev.get_history(tree.branch.repository)
297
self.assertEqual([None, '1', '2' ,'3'], history)
299
def test_common_ancestor_rootless_graph(self):
300
# common_ancestor on a graph with no reachable roots - only
301
# ghosts - should still return a useful value.
303
# add a ghost node which would be a root if it wasn't a ghost.
304
graph.add_ghost('a_ghost')
305
# add a normal commit on top of that
306
graph.add_node('rev1', ['a_ghost'])
307
# add a left-branch revision
308
graph.add_node('left', ['rev1'])
309
# add a right-branch revision
310
graph.add_node('right', ['rev1'])
311
source = MockRevisionSource(graph)
312
self.assertEqual('rev1', common_ancestor('left', 'right', source))
315
class TestMultipleRevisionSources(TestCaseWithTransport):
316
"""Tests for the MultipleRevisionSources adapter."""
318
def test_get_revision_graph_merges_ghosts(self):
319
# when we ask for the revision graph for B, which
320
# is in repo 1 with a ghost of A, and which is not
321
# in repo 2, which has A, the revision_graph()
322
# should return A and B both.
323
tree_1 = self.make_branch_and_tree('1')
324
tree_1.add_pending_merge('A')
325
tree_1.commit('foo', rev_id='B', allow_pointless=True)
326
tree_2 = self.make_branch_and_tree('2')
327
tree_2.commit('bar', rev_id='A', allow_pointless=True)
328
source = MultipleRevisionSources(tree_1.branch.repository,
329
tree_2.branch.repository)
330
self.assertEqual({'B':['A'],
332
source.get_revision_graph('B'))
added
removed
bzrlib/tests/test_revision.py
