1
# (C) 2005 Canonical Ltd
1
# Copyright (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
17
from bzrlib.selftest import TestCaseInTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
25
from bzrlib.branch import Branch
26
from bzrlib.errors import NoSuchRevision
27
from bzrlib.deprecated_graph import Graph
28
from bzrlib.revision import (find_present_ancestors, combined_graph,
30
is_ancestor, MultipleRevisionSources,
32
from bzrlib.symbol_versioning import one_zero, one_three
33
from bzrlib.tests import TestCase, TestCaseWithTransport
34
from bzrlib.trace import mutter
35
from bzrlib.workingtree import WorkingTree
37
# We're allowed to test deprecated interfaces
38
warnings.filterwarnings('ignore',
39
'.*get_intervening_revisions was deprecated',
41
r'bzrlib\.tests\.test_revision')
43
# XXX: Make this a method of a merge base case
44
def make_branches(self, format=None):
45
"""Create two branches
47
branch 1 has 6 commits, branch 2 has 3 commits
48
commit 10 is a ghosted merge merge from branch 1
60
so A is missing b6 at the start
61
and B is missing a3, a4, a5
63
tree1 = self.make_branch_and_tree("branch1", format=format)
27
commit(br1, "Commit one", rev_id="a@u-0-0")
28
commit(br1, "Commit two", rev_id="a@u-0-1")
29
commit(br1, "Commit three", rev_id="a@u-0-2")
66
tree1.commit("Commit one", rev_id="a@u-0-0")
67
tree1.commit("Commit two", rev_id="a@u-0-1")
68
tree1.commit("Commit three", rev_id="a@u-0-2")
32
br2 = Branch("branch2", init=True)
33
br2.update_revisions(br1)
34
commit(br2, "Commit four", rev_id="b@u-0-3")
35
commit(br2, "Commit five", rev_id="b@u-0-4")
70
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
72
tree2.commit("Commit four", rev_id="b@u-0-3")
73
tree2.commit("Commit five", rev_id="b@u-0-4")
36
74
revisions_2 = br2.revision_history()
37
br1.add_pending_merge(revisions_2[4])
38
commit(br1, "Commit six", rev_id="a@u-0-3")
39
commit(br1, "Commit seven", rev_id="a@u-0-4")
40
commit(br2, "Commit eight", rev_id="b@u-0-5")
41
br1.add_pending_merge(br2.revision_history()[5])
42
commit(br1, "Commit nine", rev_id="a@u-0-5")
43
br2.add_pending_merge(br1.revision_history()[4])
44
commit(br2, "Commit ten", rev_id="b@u-0-6")
75
self.assertEquals(revisions_2[-1], 'b@u-0-4')
77
tree1.merge_from_branch(br2)
78
tree1.commit("Commit six", rev_id="a@u-0-3")
79
tree1.commit("Commit seven", rev_id="a@u-0-4")
80
tree2.commit("Commit eight", rev_id="b@u-0-5")
81
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
83
tree1.merge_from_branch(br2)
84
tree1.commit("Commit nine", rev_id="a@u-0-5")
85
# DO NOT MERGE HERE - we WANT a GHOST.
86
tree2.add_parent_tree_id(br1.revision_history()[4])
87
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
48
class TestIsAncestor(TestCaseInTempDir):
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))
49
130
def test_is_ancestor(self):
50
131
"""Test checking whether a revision is an ancestor of another revision"""
51
from bzrlib.revision import is_ancestor, MultipleRevisionSources
52
from bzrlib.errors import NoSuchRevision
53
br1, br2 = make_branches()
132
br1, br2 = make_branches(self)
54
133
revisions = br1.revision_history()
55
134
revisions_2 = br2.revision_history()
56
sources = MultipleRevisionSources(br1, br2)
58
assert is_ancestor(revisions[0], revisions[0], sources)
59
assert is_ancestor(revisions[1], revisions[0], sources)
60
assert not is_ancestor(revisions[0], revisions[1], sources)
61
assert is_ancestor(revisions_2[3], revisions[0], sources)
62
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
64
assert is_ancestor(revisions[3], revisions_2[4], sources)
65
assert is_ancestor(revisions[3], revisions_2[4], br1)
66
assert is_ancestor(revisions[3], revisions_2[3], sources)
67
assert not is_ancestor(revisions[3], revisions_2[3], br1)
69
class TestIntermediateRevisions(TestCaseInTempDir):
139
self.addCleanup(br1.unlock)
141
self.addCleanup(br2.unlock)
143
self.assertTrue(self.applyDeprecated(one_zero,
144
is_ancestor, revisions[0], revisions[0], br1))
145
self.assertTrue(self.applyDeprecated(one_zero,
146
is_ancestor, revisions[1], revisions[0], sources))
147
self.assertFalse(self.applyDeprecated(one_zero,
148
is_ancestor, revisions[0], revisions[1], sources))
149
self.assertTrue(self.applyDeprecated(one_zero,
150
is_ancestor, revisions_2[3], revisions[0], sources))
151
# disabled mbp 20050914, doesn't seem to happen anymore
152
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
153
## revisions[0], br1)
154
self.assertTrue(self.applyDeprecated(one_zero,
155
is_ancestor, revisions[3], revisions_2[4], sources))
156
self.assertTrue(self.applyDeprecated(one_zero,
157
is_ancestor, revisions[3], revisions_2[4], br1))
158
self.assertTrue(self.applyDeprecated(one_zero,
159
is_ancestor, revisions[3], revisions_2[3], sources))
160
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
163
class TestIntermediateRevisions(TestCaseWithTransport):
72
from bzrlib.commit import commit
73
TestCaseInTempDir.setUp(self)
74
self.br1, self.br2 = make_branches()
75
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
76
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
77
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
78
self.br1.add_pending_merge(self.br2.revision_history()[6])
79
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
80
self.br2.add_pending_merge(self.br1.revision_history()[6])
81
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
166
TestCaseWithTransport.setUp(self)
167
self.br1, self.br2 = make_branches(self)
168
wt1 = self.br1.bzrdir.open_workingtree()
169
wt2 = self.br2.bzrdir.open_workingtree()
170
wt2.commit("Commit eleven", rev_id="b@u-0-7")
171
wt2.commit("Commit twelve", rev_id="b@u-0-8")
172
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
174
wt1.merge_from_branch(self.br2)
175
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
177
wt2.merge_from_branch(self.br1)
178
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
83
180
from bzrlib.revision import MultipleRevisionSources
84
self.sources = MultipleRevisionSources(self.br1, self.br2)
86
def intervene(self, ancestor, revision, revision_history=None):
87
from bzrlib.revision import get_intervening_revisions
88
return get_intervening_revisions(ancestor,revision, self.sources,
91
def test_intervene(self):
92
"""Find intermediate revisions, without requiring history"""
93
from bzrlib.errors import NotAncestor, NoSuchRevision
94
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
95
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
96
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
97
['a@u-0-1', 'a@u-0-2'])
98
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
99
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
100
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
101
['b@u-0-4', 'a@u-0-3'])
102
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
103
self.br1.revision_history()),
105
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
106
self.br1.revision_history()),
107
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
109
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
110
self.br1.revision_history()),
111
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
113
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
114
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
116
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
117
self.br2.revision_history()),
118
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
119
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
120
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
121
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
122
self.br2.revision_history()),
123
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
124
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
125
self.br2.revision_history())
126
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
127
'b@u-0-6', self.br2.revision_history())
128
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
129
'c@u-0-6', self.br2.revision_history())
132
class TestCommonAncestor(TestCaseInTempDir):
181
self.sources = self.applyDeprecated(one_three,
182
MultipleRevisionSources, self.br1.repository,
187
class MockRevisionSource(object):
188
"""A RevisionSource that takes a pregenerated graph.
190
This is useful for testing revision graph algorithms where
191
the actual branch existing is irrelevant.
194
def __init__(self, full_graph):
195
self._full_graph = full_graph
197
def get_revision_graph_with_ghosts(self, revision_ids):
198
# This is mocked out to just return a constant graph.
199
return self._full_graph
202
class TestCommonAncestor(TestCaseWithTransport):
133
203
"""Test checking whether a revision is an ancestor of another revision"""
135
def test_old_common_ancestor(self):
136
"""Pick a resonable merge base using the old functionality"""
137
from bzrlib.revision import find_present_ancestors
138
from bzrlib.revision import old_common_ancestor as common_ancestor
139
from bzrlib.revision import MultipleRevisionSources
140
br1, br2 = make_branches()
141
revisions = br1.revision_history()
142
revisions_2 = br2.revision_history()
143
sources = MultipleRevisionSources(br1, br2)
145
expected_ancestors_list = {revisions[3]:(0, 0),
147
revisions_2[4]:(2, 1),
149
revisions_2[3]:(4, 2),
150
revisions[0]:(5, 3) }
151
ancestors_list = find_present_ancestors(revisions[3], sources)
152
assert len(expected_ancestors_list) == len(ancestors_list)
153
for key, value in expected_ancestors_list.iteritems():
154
self.assertEqual(ancestors_list[key], value,
155
"key %r, %r != %r" % (key, ancestors_list[key],
158
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
160
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
162
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
164
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
166
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
168
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
170
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
172
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
205
def assertCommonAncestorEqual(self, expected, sources, rev_a, rev_b):
206
self.assertEqual(expected,
207
self.applyDeprecated(one_three,
208
common_ancestor, rev_a, rev_b, sources))
210
def assertCommonAncestorIn(self, possible, sources, rev_a, rev_b):
211
"""assert that we pick one among multiple possible common ancestors"""
212
self.assertTrue(self.applyDeprecated(one_three,
213
common_ancestor, rev_a, rev_b, sources)
175
216
def test_common_ancestor(self):
176
217
"""Pick a reasonable merge base"""
177
from bzrlib.revision import find_present_ancestors
178
from bzrlib.revision import common_ancestor
179
from bzrlib.revision import MultipleRevisionSources
180
br1, br2 = make_branches()
218
br1, br2 = make_branches(self)
181
219
revisions = br1.revision_history()
182
220
revisions_2 = br2.revision_history()
183
sources = MultipleRevisionSources(br1, br2)
221
sources = self.applyDeprecated(one_three,
222
MultipleRevisionSources, br1.repository, br2.repository)
185
223
expected_ancestors_list = {revisions[3]:(0, 0),
186
224
revisions[2]:(1, 1),
187
225
revisions_2[4]:(2, 1),
189
227
revisions_2[3]:(4, 2),
190
228
revisions[0]:(5, 3) }
191
229
ancestors_list = find_present_ancestors(revisions[3], sources)
192
assert len(expected_ancestors_list) == len(ancestors_list)
230
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
193
231
for key, value in expected_ancestors_list.iteritems():
194
232
self.assertEqual(ancestors_list[key], value,
195
233
"key %r, %r != %r" % (key, ancestors_list[key],
198
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
200
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
202
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
204
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
206
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
208
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
210
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
212
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
235
self.assertCommonAncestorEqual(revisions[0], sources,
236
revisions[0], revisions[0])
237
self.assertCommonAncestorEqual(revisions[1], sources,
238
revisions[1], revisions[2])
239
self.assertCommonAncestorEqual(revisions[1], sources,
240
revisions[1], revisions[1])
241
self.assertCommonAncestorEqual(revisions[2], sources,
242
revisions[2], revisions_2[4])
243
self.assertCommonAncestorEqual(revisions_2[4], sources,
244
revisions[3], revisions_2[4])
245
self.assertCommonAncestorEqual(revisions_2[4], sources,
246
revisions[4], revisions_2[5])
247
self.assertCommonAncestorIn((revisions[4], revisions_2[5]), sources,
248
revisions[5], revisions_2[6])
249
self.assertCommonAncestorIn((revisions[4], revisions_2[5]), sources,
250
revisions_2[6], revisions[5])
251
self.assertCommonAncestorEqual(None, sources,
253
self.assertCommonAncestorEqual(NULL_REVISION, sources,
254
NULL_REVISION, NULL_REVISION)
255
self.assertCommonAncestorEqual(NULL_REVISION, sources,
256
revisions[0], NULL_REVISION)
257
self.assertCommonAncestorEqual(NULL_REVISION, sources,
258
NULL_REVISION, revisions[0])
260
def test_combined(self):
262
Ensure it's not order-sensitive
264
br1, br2 = make_branches(self)
265
source = self.applyDeprecated(one_three,
266
MultipleRevisionSources, br1.repository, br2.repository)
267
combined_1 = self.applyDeprecated(one_three,
268
combined_graph, br1.last_revision(),
269
br2.last_revision(), source)
270
combined_2 = self.applyDeprecated(one_three,
271
combined_graph, br2.last_revision(),
272
br1.last_revision(), source)
273
self.assertEquals(combined_1[1], combined_2[1])
274
self.assertEquals(combined_1[2], combined_2[2])
275
self.assertEquals(combined_1[3], combined_2[3])
276
self.assertEquals(combined_1, combined_2)
278
def test_get_history(self):
279
# TODO: test ghosts on the left hand branch's impact
280
# TODO: test ghosts on all parents, we should get some
281
# indicator. i.e. NULL_REVISION
283
tree = self.make_branch_and_tree('.')
284
tree.commit('1', rev_id = '1', allow_pointless=True)
285
tree.commit('2', rev_id = '2', allow_pointless=True)
286
tree.commit('3', rev_id = '3', allow_pointless=True)
287
rev = tree.branch.repository.get_revision('1')
288
history = rev.get_history(tree.branch.repository)
289
self.assertEqual([None, '1'], history)
290
rev = tree.branch.repository.get_revision('2')
291
history = rev.get_history(tree.branch.repository)
292
self.assertEqual([None, '1', '2'], history)
293
rev = tree.branch.repository.get_revision('3')
294
history = rev.get_history(tree.branch.repository)
295
self.assertEqual([None, '1', '2' ,'3'], history)
297
def test_common_ancestor_rootless_graph(self):
298
# common_ancestor on a graph with no reachable roots - only
299
# ghosts - should still return a useful value.
301
# add a ghost node which would be a root if it wasn't a ghost.
302
graph.add_ghost('a_ghost')
303
# add a normal commit on top of that
304
graph.add_node('rev1', ['a_ghost'])
305
# add a left-branch revision
306
graph.add_node('left', ['rev1'])
307
# add a right-branch revision
308
graph.add_node('right', ['rev1'])
309
source = MockRevisionSource(graph)
310
self.assertCommonAncestorEqual('rev1', source, 'left', 'right')
313
class TestMultipleRevisionSources(TestCaseWithTransport):
314
"""Tests for the MultipleRevisionSources adapter."""
316
def test_get_revision_graph_merges_ghosts(self):
317
# when we ask for the revision graph for B, which
318
# is in repo 1 with a ghost of A, and which is not
319
# in repo 2, which has A, the revision_graph()
320
# should return A and B both.
321
tree_1 = self.make_branch_and_tree('1')
322
tree_1.set_parent_ids(['A'], allow_leftmost_as_ghost=True)
323
tree_1.commit('foo', rev_id='B', allow_pointless=True)
324
tree_2 = self.make_branch_and_tree('2')
325
tree_2.commit('bar', rev_id='A', allow_pointless=True)
326
source = self.applyDeprecated(one_three,
327
MultipleRevisionSources, tree_1.branch.repository,
328
tree_2.branch.repository)
329
# get_revision_graph calls the deprecated
330
# get_revision_graph_with_ghosts once for each repository.
331
expected_warning = symbol_versioning.deprecation_string(
332
tree_1.branch.repository.get_revision_graph_with_ghosts,
334
rev_graph = self.callDeprecated([expected_warning, expected_warning],
335
source.get_revision_graph, 'B')
336
self.assertEqual({'B':['A'],
340
class TestReservedId(TestCase):
342
def test_is_reserved_id(self):
343
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
344
self.assertEqual(True, revision.is_reserved_id(
345
revision.CURRENT_REVISION))
346
self.assertEqual(True, revision.is_reserved_id('arch:'))
347
self.assertEqual(False, revision.is_reserved_id('null'))
348
self.assertEqual(False, revision.is_reserved_id(
349
'arch:a@example.com/c--b--v--r'))
350
self.assertEqual(False, revision.is_reserved_id(None))
353
class TestRevisionMethods(TestCase):
355
def test_get_summary(self):
356
r = revision.Revision('1')
358
self.assertEqual('a', r.get_summary())
360
self.assertEqual('a', r.get_summary())
362
self.assertEqual('a', r.get_summary())
364
def test_get_apparent_author(self):
365
r = revision.Revision('1')
367
self.assertEqual('A', r.get_apparent_author())
368
r.properties['author'] = 'B'
369
self.assertEqual('B', r.get_apparent_author())
added
removed
bzrlib/tests/test_revision.py
