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
21
from bzrlib.branch import Branch
22
from bzrlib.errors import NoSuchRevision
23
from bzrlib.graph import Graph
22
from bzrlib.commit import commit
23
from bzrlib.fetch import fetch
24
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
26
is_ancestor, MultipleRevisionSources,
28
from bzrlib.tests import TestCaseWithTransport
25
is_ancestor, MultipleRevisionSources)
29
26
from bzrlib.trace import mutter
30
from bzrlib.workingtree import WorkingTree
32
# We're allowed to test deprecated interfaces
33
warnings.filterwarnings('ignore',
34
'.*get_intervening_revisions was deprecated',
36
r'bzrlib\.tests\.test_revision')
38
# XXX: Make this a method of a merge base case
39
def make_branches(self):
27
from bzrlib.errors import NoSuchRevision
40
30
"""Create two branches
42
32
branch 1 has 6 commits, branch 2 has 3 commits
43
commit 10 is a ghosted merge merge from branch 1
33
commit 10 was a psuedo merge from branch 1
34
but has been disabled until ghost support is
45
37
the object graph is
55
47
so A is missing b6 at the start
56
48
and B is missing a3, a4, a5
58
tree1 = self.make_branch_and_tree("branch1")
51
br1 = Branch.initialize("branch1")
61
tree1.commit("Commit one", rev_id="a@u-0-0")
62
tree1.commit("Commit two", rev_id="a@u-0-1")
63
tree1.commit("Commit three", rev_id="a@u-0-2")
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")
65
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
67
tree2.commit("Commit four", rev_id="b@u-0-3")
68
tree2.commit("Commit five", rev_id="b@u-0-4")
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")
69
62
revisions_2 = br2.revision_history()
72
tree1.add_pending_merge(revisions_2[4])
73
self.assertEquals(revisions_2[4], 'b@u-0-4')
74
tree1.commit("Commit six", rev_id="a@u-0-3")
75
tree1.commit("Commit seven", rev_id="a@u-0-4")
76
tree2.commit("Commit eight", rev_id="b@u-0-5")
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")
79
tree1.add_pending_merge(br2.revision_history()[5])
80
tree1.commit("Commit nine", rev_id="a@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")
81
74
# DO NOT FETCH HERE - we WANT a GHOST.
83
tree2.add_pending_merge(br1.revision_history()[4])
84
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
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")
89
class TestIsAncestor(TestCaseWithTransport):
82
class TestIsAncestor(TestCaseInTempDir):
91
83
def test_recorded_ancestry(self):
92
84
"""Test that commit records all ancestors"""
93
br1, br2 = make_branches(self)
85
br1, br2 = make_branches()
94
86
d = [('a@u-0-0', ['a@u-0-0']),
95
87
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
96
88
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
119
111
if rev_id in br2_only and not branch is br2:
121
113
mutter('ancestry of {%s}: %r',
122
rev_id, branch.repository.get_ancestry(rev_id))
123
result = sorted(branch.repository.get_ancestry(rev_id))
124
self.assertEquals(result, [None] + sorted(anc))
114
rev_id, branch.get_ancestry(rev_id))
115
self.assertEquals(sorted(branch.get_ancestry(rev_id)),
116
[None] + sorted(anc))
127
119
def test_is_ancestor(self):
128
120
"""Test checking whether a revision is an ancestor of another revision"""
129
br1, br2 = make_branches(self)
121
br1, br2 = make_branches()
130
122
revisions = br1.revision_history()
131
123
revisions_2 = br2.revision_history()
134
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
135
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
136
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
137
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
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)
138
130
# disabled mbp 20050914, doesn't seem to happen anymore
139
131
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
140
132
## revisions[0], br1)
141
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
142
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
143
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
144
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
147
class TestIntermediateRevisions(TestCaseWithTransport):
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):
150
TestCaseWithTransport.setUp(self)
151
self.br1, self.br2 = make_branches(self)
152
wt1 = self.br1.bzrdir.open_workingtree()
153
wt2 = self.br2.bzrdir.open_workingtree()
154
wt2.commit("Commit eleven", rev_id="b@u-0-7")
155
wt2.commit("Commit twelve", rev_id="b@u-0-8")
156
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
158
self.br1.fetch(self.br2)
159
wt1.add_pending_merge(self.br2.revision_history()[6])
160
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
162
self.br2.fetch(self.br1)
163
wt2.add_pending_merge(self.br1.revision_history()[6])
164
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
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")
166
158
from bzrlib.revision import MultipleRevisionSources
167
self.sources = MultipleRevisionSources(self.br1.repository,
172
class MockRevisionSource(object):
173
"""A RevisionSource that takes a pregenerated graph.
175
This is useful for testing revision graph algorithms where
176
the actual branch existing is irrelevant.
179
def __init__(self, full_graph):
180
self._full_graph = full_graph
182
def get_revision_graph_with_ghosts(self, revision_ids):
183
# This is mocked out to just return a constant graph.
184
return self._full_graph
187
class TestCommonAncestor(TestCaseWithTransport):
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):
188
210
"""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),
190
251
def test_common_ancestor(self):
191
252
"""Pick a reasonable merge base"""
192
br1, br2 = make_branches(self)
253
from bzrlib.revision import common_ancestor
254
br1, br2 = make_branches()
193
255
revisions = br1.revision_history()
194
256
revisions_2 = br2.revision_history()
195
sources = MultipleRevisionSources(br1.repository, br2.repository)
257
sources = MultipleRevisionSources(br1, br2)
196
258
expected_ancestors_list = {revisions[3]:(0, 0),
197
259
revisions[2]:(1, 1),
198
260
revisions_2[4]:(2, 1),
218
280
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
220
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
221
(revisions[4], revisions_2[5]))
222
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
223
(revisions[4], revisions_2[5]))
224
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
225
self.assertEqual(NULL_REVISION,
226
common_ancestor(NULL_REVISION, NULL_REVISION, sources))
227
self.assertEqual(NULL_REVISION,
228
common_ancestor(revisions[0], NULL_REVISION, sources))
229
self.assertEqual(NULL_REVISION,
230
common_ancestor(NULL_REVISION, revisions[0], 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
232
287
def test_combined(self):
233
288
"""combined_graph
234
289
Ensure it's not order-sensitive
236
br1, br2 = make_branches(self)
237
source = MultipleRevisionSources(br1.repository, br2.repository)
291
br1, br2 = make_branches()
292
source = MultipleRevisionSources(br1, br2)
238
293
combined_1 = combined_graph(br1.last_revision(),
239
294
br2.last_revision(), source)
240
295
combined_2 = combined_graph(br2.last_revision(),
241
296
br1.last_revision(), source)
242
self.assertEquals(combined_1[1], combined_2[1])
243
self.assertEquals(combined_1[2], combined_2[2])
244
self.assertEquals(combined_1[3], combined_2[3])
245
self.assertEquals(combined_1, combined_2)
247
def test_get_history(self):
248
# TODO: test ghosts on the left hand branch's impact
249
# TODO: test ghosts on all parents, we should get some
250
# indicator. i.e. NULL_REVISION
252
tree = self.make_branch_and_tree('.')
253
tree.commit('1', rev_id = '1', allow_pointless=True)
254
tree.commit('2', rev_id = '2', allow_pointless=True)
255
tree.commit('3', rev_id = '3', allow_pointless=True)
256
rev = tree.branch.repository.get_revision('1')
257
history = rev.get_history(tree.branch.repository)
258
self.assertEqual([None, '1'], history)
259
rev = tree.branch.repository.get_revision('2')
260
history = rev.get_history(tree.branch.repository)
261
self.assertEqual([None, '1', '2'], history)
262
rev = tree.branch.repository.get_revision('3')
263
history = rev.get_history(tree.branch.repository)
264
self.assertEqual([None, '1', '2' ,'3'], history)
266
def test_common_ancestor_rootless_graph(self):
267
# common_ancestor on a graph with no reachable roots - only
268
# ghosts - should still return a useful value.
270
# add a ghost node which would be a root if it wasn't a ghost.
271
graph.add_ghost('a_ghost')
272
# add a normal commit on top of that
273
graph.add_node('rev1', ['a_ghost'])
274
# add a left-branch revision
275
graph.add_node('left', ['rev1'])
276
# add a right-branch revision
277
graph.add_node('right', ['rev1'])
278
source = MockRevisionSource(graph)
279
self.assertEqual('rev1', common_ancestor('left', 'right', source))
282
class TestMultipleRevisionSources(TestCaseWithTransport):
283
"""Tests for the MultipleRevisionSources adapter."""
285
def test_get_revision_graph_merges_ghosts(self):
286
# when we ask for the revision graph for B, which
287
# is in repo 1 with a ghost of A, and which is not
288
# in repo 2, which has A, the revision_graph()
289
# should return A and B both.
290
tree_1 = self.make_branch_and_tree('1')
291
tree_1.add_pending_merge('A')
292
tree_1.commit('foo', rev_id='B', allow_pointless=True)
293
tree_2 = self.make_branch_and_tree('2')
294
tree_2.commit('bar', rev_id='A', allow_pointless=True)
295
source = MultipleRevisionSources(tree_1.branch.repository,
296
tree_2.branch.repository)
297
self.assertEqual({'B':['A'],
299
source.get_revision_graph('B'))
301
class TestRevisionAttributes(TestCaseWithTransport):
302
"""Test that revision attributes are correct."""
304
def test_revision_accessors(self):
305
"""Make sure the values that come out of a revision are the same as the ones that go in.
307
tree1 = self.make_branch_and_tree("br1")
310
tree1.commit(message="quux", allow_pointless=True, committer="jaq",
311
revprops={'empty':'',
314
'multiline':'foo\nbar\n\n'
316
assert len(tree1.branch.revision_history()) > 0
317
rev_a = tree1.branch.repository.get_revision(tree1.branch.last_revision())
319
tree2 = self.make_branch_and_tree("br2")
320
tree2.commit(message=rev_a.message,
321
timestamp=rev_a.timestamp,
322
timezone=rev_a.timezone,
323
committer=rev_a.committer,
324
rev_id=rev_a.revision_id,
325
revprops=rev_a.properties,
326
allow_pointless=True, # there's nothing in this commit
329
rev_b = tree2.branch.repository.get_revision(tree2.branch.last_revision())
331
self.assertEqual(rev_a.message, rev_b.message)
332
self.assertEqual(rev_a.timestamp, rev_b.timestamp)
333
self.assertEqual(rev_a.timezone, rev_b.timezone)
334
self.assertEqual(rev_a.committer, rev_b.committer)
335
self.assertEqual(rev_a.revision_id, rev_b.revision_id)
336
self.assertEqual(rev_a.properties, rev_b.properties)
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
added
removed
bzrlib/selftest/testrevision.py
