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
24
from bzrlib.branch import Branch
25
from bzrlib.errors import NoSuchRevision
26
from bzrlib.graph import Graph
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
29
is_ancestor, MultipleRevisionSources,
31
from bzrlib.tests import TestCase, TestCaseWithTransport
32
from bzrlib.trace import mutter
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):
43
"""Create two branches
45
branch 1 has 6 commits, branch 2 has 3 commits
46
commit 10 is a ghosted merge merge from branch 1
58
so A is missing b6 at the start
59
and B is missing a3, a4, a5
61
tree1 = self.make_branch_and_tree("branch1")
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")
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")
72
revisions_2 = br2.revision_history()
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")
82
tree1.add_pending_merge(br2.revision_history()[5])
83
tree1.commit("Commit nine", rev_id="a@u-0-5")
84
# DO NOT FETCH HERE - we WANT a GHOST.
86
tree2.add_pending_merge(br1.revision_history()[4])
87
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
92
class TestIsAncestor(TestCaseWithTransport):
94
def test_recorded_ancestry(self):
95
"""Test that commit records all ancestors"""
96
br1, br2 = make_branches(self)
97
d = [('a@u-0-0', ['a@u-0-0']),
98
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
99
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
100
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
101
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
103
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
105
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
106
'a@u-0-3', 'a@u-0-4']),
107
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
109
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
110
'b@u-0-3', 'b@u-0-4',
111
'b@u-0-5', 'a@u-0-5']),
112
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
113
'b@u-0-3', 'b@u-0-4',
114
'b@u-0-5', 'b@u-0-6']),
116
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
117
br2_only = ('b@u-0-6',)
118
for branch in br1, br2:
119
for rev_id, anc in d:
120
if rev_id in br1_only and not branch is br1:
122
if rev_id in br2_only and not branch is br2:
124
mutter('ancestry of {%s}: %r',
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))
130
def test_is_ancestor(self):
131
"""Test checking whether a revision is an ancestor of another revision"""
132
br1, br2 = make_branches(self)
133
revisions = br1.revision_history()
134
revisions_2 = br2.revision_history()
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))
141
# disabled mbp 20050914, doesn't seem to happen anymore
142
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
143
## revisions[0], br1)
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):
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")
169
from bzrlib.revision import MultipleRevisionSources
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):
191
"""Test checking whether a revision is an ancestor of another revision"""
193
def test_common_ancestor(self):
194
"""Pick a reasonable merge base"""
195
br1, br2 = make_branches(self)
196
revisions = br1.revision_history()
197
revisions_2 = br2.revision_history()
198
sources = MultipleRevisionSources(br1.repository, br2.repository)
199
expected_ancestors_list = {revisions[3]:(0, 0),
201
revisions_2[4]:(2, 1),
203
revisions_2[3]:(4, 2),
204
revisions[0]:(5, 3) }
205
ancestors_list = find_present_ancestors(revisions[3], sources)
206
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
207
for key, value in expected_ancestors_list.iteritems():
208
self.assertEqual(ancestors_list[key], value,
209
"key %r, %r != %r" % (key, ancestors_list[key],
211
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
213
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
215
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
217
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
219
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
221
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
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))
235
def test_combined(self):
237
Ensure it's not order-sensitive
239
br1, br2 = make_branches(self)
240
source = MultipleRevisionSources(br1.repository, br2.repository)
241
combined_1 = combined_graph(br1.last_revision(),
242
br2.last_revision(), source)
243
combined_2 = combined_graph(br2.last_revision(),
244
br1.last_revision(), source)
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
