1
1
# (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
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
20
from bzrlib.selftest import TestCaseInTempDir
21
24
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
23
from bzrlib.fetch import fetch
25
from bzrlib.errors import NoSuchRevision
26
from bzrlib.graph import Graph
24
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
is_ancestor, MultipleRevisionSources)
29
is_ancestor, MultipleRevisionSources,
31
from bzrlib.tests import TestCase, TestCaseWithTransport
26
32
from bzrlib.trace import mutter
27
from bzrlib.errors import NoSuchRevision
33
from bzrlib.workingtree import WorkingTree
35
# We're allowed to test deprecated interfaces
36
warnings.filterwarnings('ignore',
37
'.*get_intervening_revisions was deprecated',
39
r'bzrlib\.tests\.test_revision')
41
# XXX: Make this a method of a merge base case
42
def make_branches(self):
30
43
"""Create two branches
32
45
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
46
commit 10 is a ghosted merge merge from branch 1
37
48
the object graph is
47
58
so A is missing b6 at the start
48
59
and B is missing a3, a4, a5
51
br1 = Branch.initialize("branch1")
61
tree1 = self.make_branch_and_tree("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")
64
tree1.commit("Commit one", rev_id="a@u-0-0")
65
tree1.commit("Commit two", rev_id="a@u-0-1")
66
tree1.commit("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")
68
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
70
tree2.commit("Commit four", rev_id="b@u-0-3")
71
tree2.commit("Commit five", rev_id="b@u-0-4")
62
72
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")
75
tree1.add_pending_merge(revisions_2[4])
76
self.assertEquals(revisions_2[4], 'b@u-0-4')
77
tree1.commit("Commit six", rev_id="a@u-0-3")
78
tree1.commit("Commit seven", rev_id="a@u-0-4")
79
tree2.commit("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")
82
tree1.add_pending_merge(br2.revision_history()[5])
83
tree1.commit("Commit nine", rev_id="a@u-0-5")
74
84
# 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")
86
tree2.add_pending_merge(br1.revision_history()[4])
87
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
82
class TestIsAncestor(TestCaseInTempDir):
92
class TestIsAncestor(TestCaseWithTransport):
83
94
def test_recorded_ancestry(self):
84
95
"""Test that commit records all ancestors"""
85
br1, br2 = make_branches()
96
br1, br2 = make_branches(self)
86
97
d = [('a@u-0-0', ['a@u-0-0']),
87
98
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
88
99
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
111
122
if rev_id in br2_only and not branch is br2:
113
124
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))
125
rev_id, branch.repository.get_ancestry(rev_id))
126
result = sorted(branch.repository.get_ancestry(rev_id))
127
self.assertEquals(result, [None] + sorted(anc))
119
130
def test_is_ancestor(self):
120
131
"""Test checking whether a revision is an ancestor of another revision"""
121
br1, br2 = make_branches()
132
br1, br2 = make_branches(self)
122
133
revisions = br1.revision_history()
123
134
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)
137
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
138
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
139
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
140
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
130
141
# disabled mbp 20050914, doesn't seem to happen anymore
131
142
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
132
143
## 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):
144
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
145
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
146
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
147
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
150
class TestIntermediateRevisions(TestCaseWithTransport):
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")
153
TestCaseWithTransport.setUp(self)
154
self.br1, self.br2 = make_branches(self)
155
wt1 = self.br1.bzrdir.open_workingtree()
156
wt2 = self.br2.bzrdir.open_workingtree()
157
wt2.commit("Commit eleven", rev_id="b@u-0-7")
158
wt2.commit("Commit twelve", rev_id="b@u-0-8")
159
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
161
self.br1.fetch(self.br2)
162
wt1.add_pending_merge(self.br2.revision_history()[6])
163
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
165
self.br2.fetch(self.br1)
166
wt2.add_pending_merge(self.br1.revision_history()[6])
167
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
158
169
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):
170
self.sources = MultipleRevisionSources(self.br1.repository,
175
class MockRevisionSource(object):
176
"""A RevisionSource that takes a pregenerated graph.
178
This is useful for testing revision graph algorithms where
179
the actual branch existing is irrelevant.
182
def __init__(self, full_graph):
183
self._full_graph = full_graph
185
def get_revision_graph_with_ghosts(self, revision_ids):
186
# This is mocked out to just return a constant graph.
187
return self._full_graph
190
class TestCommonAncestor(TestCaseWithTransport):
210
191
"""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
193
def test_common_ancestor(self):
252
194
"""Pick a reasonable merge base"""
253
from bzrlib.revision import common_ancestor
254
br1, br2 = make_branches()
195
br1, br2 = make_branches(self)
255
196
revisions = br1.revision_history()
256
197
revisions_2 = br2.revision_history()
257
sources = MultipleRevisionSources(br1, br2)
198
sources = MultipleRevisionSources(br1.repository, br2.repository)
258
199
expected_ancestors_list = {revisions[3]:(0, 0),
259
200
revisions[2]:(1, 1),
260
201
revisions_2[4]:(2, 1),
280
221
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
223
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
224
(revisions[4], revisions_2[5]))
225
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
226
(revisions[4], revisions_2[5]))
227
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
228
self.assertEqual(NULL_REVISION,
229
common_ancestor(NULL_REVISION, NULL_REVISION, sources))
230
self.assertEqual(NULL_REVISION,
231
common_ancestor(revisions[0], NULL_REVISION, sources))
232
self.assertEqual(NULL_REVISION,
233
common_ancestor(NULL_REVISION, revisions[0], sources))
287
235
def test_combined(self):
288
236
"""combined_graph
289
237
Ensure it's not order-sensitive
291
br1, br2 = make_branches()
292
source = MultipleRevisionSources(br1, br2)
239
br1, br2 = make_branches(self)
240
source = MultipleRevisionSources(br1.repository, br2.repository)
293
241
combined_1 = combined_graph(br1.last_revision(),
294
242
br2.last_revision(), source)
295
243
combined_2 = combined_graph(br2.last_revision(),
296
244
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
245
self.assertEquals(combined_1[1], combined_2[1])
246
self.assertEquals(combined_1[2], combined_2[2])
247
self.assertEquals(combined_1[3], combined_2[3])
248
self.assertEquals(combined_1, combined_2)
250
def test_get_history(self):
251
# TODO: test ghosts on the left hand branch's impact
252
# TODO: test ghosts on all parents, we should get some
253
# indicator. i.e. NULL_REVISION
255
tree = self.make_branch_and_tree('.')
256
tree.commit('1', rev_id = '1', allow_pointless=True)
257
tree.commit('2', rev_id = '2', allow_pointless=True)
258
tree.commit('3', rev_id = '3', allow_pointless=True)
259
rev = tree.branch.repository.get_revision('1')
260
history = rev.get_history(tree.branch.repository)
261
self.assertEqual([None, '1'], history)
262
rev = tree.branch.repository.get_revision('2')
263
history = rev.get_history(tree.branch.repository)
264
self.assertEqual([None, '1', '2'], history)
265
rev = tree.branch.repository.get_revision('3')
266
history = rev.get_history(tree.branch.repository)
267
self.assertEqual([None, '1', '2' ,'3'], history)
269
def test_common_ancestor_rootless_graph(self):
270
# common_ancestor on a graph with no reachable roots - only
271
# ghosts - should still return a useful value.
273
# add a ghost node which would be a root if it wasn't a ghost.
274
graph.add_ghost('a_ghost')
275
# add a normal commit on top of that
276
graph.add_node('rev1', ['a_ghost'])
277
# add a left-branch revision
278
graph.add_node('left', ['rev1'])
279
# add a right-branch revision
280
graph.add_node('right', ['rev1'])
281
source = MockRevisionSource(graph)
282
self.assertEqual('rev1', common_ancestor('left', 'right', source))
285
class TestMultipleRevisionSources(TestCaseWithTransport):
286
"""Tests for the MultipleRevisionSources adapter."""
288
def test_get_revision_graph_merges_ghosts(self):
289
# when we ask for the revision graph for B, which
290
# is in repo 1 with a ghost of A, and which is not
291
# in repo 2, which has A, the revision_graph()
292
# should return A and B both.
293
tree_1 = self.make_branch_and_tree('1')
294
tree_1.add_pending_merge('A')
295
tree_1.commit('foo', rev_id='B', allow_pointless=True)
296
tree_2 = self.make_branch_and_tree('2')
297
tree_2.commit('bar', rev_id='A', allow_pointless=True)
298
source = MultipleRevisionSources(tree_1.branch.repository,
299
tree_2.branch.repository)
300
self.assertEqual({'B':['A'],
302
source.get_revision_graph('B'))
added
removed
bzrlib/tests/test_revision.py
