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
18
from bzrlib.revision import is_ancestor, MultipleRevisionSources
19
from bzrlib.revision import combined_graph
22
from bzrlib.branch import Branch
23
from bzrlib.commit import commit
26
br1 = Branch.initialize("branch1")
21
from bzrlib.branch import Branch
22
from bzrlib.errors import NoSuchRevision
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
# We're allowed to test deprecated interfaces
32
warnings.filterwarnings('ignore',
33
'.*get_intervening_revisions was deprecated',
35
r'bzrlib\.tests\.test_revision')
37
# XXX: Make this a method of a merge base case
38
def make_branches(self):
39
"""Create two branches
41
branch 1 has 6 commits, branch 2 has 3 commits
42
commit 10 is a ghosted merge merge from branch 1
54
so A is missing b6 at the start
55
and B is missing a3, a4, a5
57
tree1 = self.make_branch_and_tree("branch1")
28
commit(br1, "Commit one", rev_id="a@u-0-0")
29
commit(br1, "Commit two", rev_id="a@u-0-1")
30
commit(br1, "Commit three", rev_id="a@u-0-2")
60
tree1.commit("Commit one", rev_id="a@u-0-0")
61
tree1.commit("Commit two", rev_id="a@u-0-1")
62
tree1.commit("Commit three", rev_id="a@u-0-2")
33
br2 = Branch.initialize("branch2")
34
br2.update_revisions(br1)
35
commit(br2, "Commit four", rev_id="b@u-0-3")
36
commit(br2, "Commit five", rev_id="b@u-0-4")
64
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
66
tree2.commit("Commit four", rev_id="b@u-0-3")
67
tree2.commit("Commit five", rev_id="b@u-0-4")
37
68
revisions_2 = br2.revision_history()
38
br1.add_pending_merge(revisions_2[4])
39
commit(br1, "Commit six", rev_id="a@u-0-3")
40
commit(br1, "Commit seven", rev_id="a@u-0-4")
41
commit(br2, "Commit eight", rev_id="b@u-0-5")
42
br1.add_pending_merge(br2.revision_history()[5])
43
commit(br1, "Commit nine", rev_id="a@u-0-5")
44
br2.add_pending_merge(br1.revision_history()[4])
45
commit(br2, "Commit ten", rev_id="b@u-0-6")
71
tree1.add_pending_merge(revisions_2[4])
72
self.assertEquals(revisions_2[4], 'b@u-0-4')
73
tree1.commit("Commit six", rev_id="a@u-0-3")
74
tree1.commit("Commit seven", rev_id="a@u-0-4")
75
tree2.commit("Commit eight", rev_id="b@u-0-5")
78
tree1.add_pending_merge(br2.revision_history()[5])
79
tree1.commit("Commit nine", rev_id="a@u-0-5")
80
# DO NOT FETCH HERE - we WANT a GHOST.
82
tree2.add_pending_merge(br1.revision_history()[4])
83
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
49
class TestIsAncestor(TestCaseInTempDir):
88
class TestIsAncestor(TestCaseWithTransport):
90
def test_recorded_ancestry(self):
91
"""Test that commit records all ancestors"""
92
br1, br2 = make_branches(self)
93
d = [('a@u-0-0', ['a@u-0-0']),
94
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
95
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
96
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
97
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
99
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
101
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
102
'a@u-0-3', 'a@u-0-4']),
103
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
105
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
106
'b@u-0-3', 'b@u-0-4',
107
'b@u-0-5', 'a@u-0-5']),
108
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
109
'b@u-0-3', 'b@u-0-4',
110
'b@u-0-5', 'b@u-0-6']),
112
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
113
br2_only = ('b@u-0-6',)
114
for branch in br1, br2:
115
for rev_id, anc in d:
116
if rev_id in br1_only and not branch is br1:
118
if rev_id in br2_only and not branch is br2:
120
mutter('ancestry of {%s}: %r',
121
rev_id, branch.repository.get_ancestry(rev_id))
122
result = sorted(branch.repository.get_ancestry(rev_id))
123
self.assertEquals(result, [None] + sorted(anc))
50
126
def test_is_ancestor(self):
51
127
"""Test checking whether a revision is an ancestor of another revision"""
52
from bzrlib.errors import NoSuchRevision
53
br1, br2 = make_branches()
128
br1, br2 = make_branches(self)
54
129
revisions = br1.revision_history()
55
130
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):
133
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
134
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
135
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
136
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
137
# disabled mbp 20050914, doesn't seem to happen anymore
138
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
139
## revisions[0], br1)
140
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
141
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
142
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
143
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
146
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")
149
TestCaseWithTransport.setUp(self)
150
self.br1, self.br2 = make_branches(self)
151
wt1 = self.br1.bzrdir.open_workingtree()
152
wt2 = self.br2.bzrdir.open_workingtree()
153
wt2.commit("Commit eleven", rev_id="b@u-0-7")
154
wt2.commit("Commit twelve", rev_id="b@u-0-8")
155
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
157
self.br1.fetch(self.br2)
158
wt1.add_pending_merge(self.br2.revision_history()[6])
159
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
161
self.br2.fetch(self.br1)
162
wt2.add_pending_merge(self.br1.revision_history()[6])
163
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
83
165
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):
166
self.sources = MultipleRevisionSources(self.br1.repository,
171
class MockRevisionSource(object):
172
"""A RevisionSource that takes a pregenerated graph.
174
This is useful for testing revision graph algorithms where
175
the actual branch existing is irrelevant.
178
def __init__(self, full_graph):
179
self._full_graph = full_graph
181
def get_revision_graph_with_ghosts(self, revision_ids):
182
# This is mocked out to just return a constant graph.
183
return self._full_graph
186
class TestCommonAncestor(TestCaseWithTransport):
133
187
"""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),
175
189
def test_common_ancestor(self):
176
190
"""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()
191
br1, br2 = make_branches(self)
181
192
revisions = br1.revision_history()
182
193
revisions_2 = br2.revision_history()
183
sources = MultipleRevisionSources(br1, br2)
194
sources = MultipleRevisionSources(br1.repository, br2.repository)
185
195
expected_ancestors_list = {revisions[3]:(0, 0),
186
196
revisions[2]:(1, 1),
187
197
revisions_2[4]:(2, 1),
208
217
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),
219
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
220
(revisions[4], revisions_2[5]))
221
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
222
(revisions[4], revisions_2[5]))
223
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
215
225
def test_combined(self):
216
226
"""combined_graph
217
227
Ensure it's not order-sensitive
219
br1, br2 = make_branches()
220
source = MultipleRevisionSources(br1, br2)
221
combined_1 = combined_graph(br1.last_patch(), br2.last_patch(), source)
222
combined_2 = combined_graph(br2.last_patch(), br1.last_patch(), source)
223
assert combined_1[1] == combined_2[1]
224
assert combined_1[2] == combined_2[2]
225
assert combined_1[3] == combined_2[3]
226
assert combined_1 == combined_2
229
br1, br2 = make_branches(self)
230
source = MultipleRevisionSources(br1.repository, br2.repository)
231
combined_1 = combined_graph(br1.last_revision(),
232
br2.last_revision(), source)
233
combined_2 = combined_graph(br2.last_revision(),
234
br1.last_revision(), source)
235
self.assertEquals(combined_1[1], combined_2[1])
236
self.assertEquals(combined_1[2], combined_2[2])
237
self.assertEquals(combined_1[3], combined_2[3])
238
self.assertEquals(combined_1, combined_2)
240
def test_get_history(self):
241
# TODO: test ghosts on the left hand branch's impact
242
# TODO: test ghosts on all parents, we should get some
243
# indicator. i.e. NULL_REVISION
245
tree = self.make_branch_and_tree('.')
246
tree.commit('1', rev_id = '1', allow_pointless=True)
247
tree.commit('2', rev_id = '2', allow_pointless=True)
248
tree.commit('3', rev_id = '3', allow_pointless=True)
249
rev = tree.branch.repository.get_revision('1')
250
history = rev.get_history(tree.branch.repository)
251
self.assertEqual([None, '1'], history)
252
rev = tree.branch.repository.get_revision('2')
253
history = rev.get_history(tree.branch.repository)
254
self.assertEqual([None, '1', '2'], history)
255
rev = tree.branch.repository.get_revision('3')
256
history = rev.get_history(tree.branch.repository)
257
self.assertEqual([None, '1', '2' ,'3'], history)
259
def test_common_ancestor_rootless_graph(self):
260
# common_ancestor on a graph with no reachable roots - only
261
# ghosts - should still return a useful value.
263
# add a ghost node which would be a root if it wasn't a ghost.
264
graph.add_ghost('a_ghost')
265
# add a normal commit on top of that
266
graph.add_node('rev1', ['a_ghost'])
267
# add a left-branch revision
268
graph.add_node('left', ['rev1'])
269
# add a right-branch revision
270
graph.add_node('right', ['rev1'])
271
source = MockRevisionSource(graph)
272
self.assertEqual('rev1', common_ancestor('left', 'right', source))
275
class TestMultipleRevisionSources(TestCaseWithTransport):
276
"""Tests for the MultipleRevisionSources adapter."""
278
def test_get_revision_graph_merges_ghosts(self):
279
# when we ask for the revision graph for B, which
280
# is in repo 1 with a ghost of A, and which is not
281
# in repo 2, which has A, the revision_graph()
282
# should return A and B both.
283
tree_1 = self.make_branch_and_tree('1')
284
tree_1.add_pending_merge('A')
285
tree_1.commit('foo', rev_id='B', allow_pointless=True)
286
tree_2 = self.make_branch_and_tree('2')
287
tree_2.commit('bar', rev_id='A', allow_pointless=True)
288
source = MultipleRevisionSources(tree_1.branch.repository,
289
tree_2.branch.repository)
290
self.assertEqual({'B':['A'],
292
source.get_revision_graph('B'))
added
removed
bzrlib/tests/test_revision.py
