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
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,
28
from bzrlib.tests import TestCaseWithTransport
29
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):
40
"""Create two branches
42
branch 1 has 6 commits, branch 2 has 3 commits
43
commit 10 is a ghosted merge merge from branch 1
55
so A is missing b6 at the start
56
and B is missing a3, a4, a5
58
tree1 = self.make_branch_and_tree("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")
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")
17
from bzrlib.selftest import InTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
26
commit(br1, "Commit one")
27
commit(br1, "Commit two")
28
commit(br1, "Commit three")
31
br2 = Branch("branch2", init=True)
32
br2.update_revisions(br1)
33
commit(br2, "Commit four")
34
commit(br2, "Commit five")
69
35
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")
79
tree1.add_pending_merge(br2.revision_history()[5])
80
tree1.commit("Commit nine", rev_id="a@u-0-5")
81
# 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")
36
br1.add_pending_merge(revisions_2[4])
37
commit(br1, "Commit six")
89
class TestIsAncestor(TestCaseWithTransport):
91
def test_recorded_ancestry(self):
92
"""Test that commit records all ancestors"""
93
br1, br2 = make_branches(self)
94
d = [('a@u-0-0', ['a@u-0-0']),
95
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
96
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
97
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
98
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
100
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
102
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
103
'a@u-0-3', 'a@u-0-4']),
104
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
106
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
107
'b@u-0-3', 'b@u-0-4',
108
'b@u-0-5', 'a@u-0-5']),
109
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
110
'b@u-0-3', 'b@u-0-4',
111
'b@u-0-5', 'b@u-0-6']),
113
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
114
br2_only = ('b@u-0-6',)
115
for branch in br1, br2:
116
for rev_id, anc in d:
117
if rev_id in br1_only and not branch is br1:
119
if rev_id in br2_only and not branch is br2:
121
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))
127
def test_is_ancestor(self):
128
"""Test checking whether a revision is an ancestor of another revision"""
129
br1, br2 = make_branches(self)
130
revisions = br1.revision_history()
131
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))
138
# disabled mbp 20050914, doesn't seem to happen anymore
139
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
140
## 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):
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")
166
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):
41
class TestIsAncestor(InTempDir):
188
42
"""Test checking whether a revision is an ancestor of another revision"""
190
def test_common_ancestor(self):
191
"""Pick a reasonable merge base"""
192
br1, br2 = make_branches(self)
44
from bzrlib.revision import is_ancestor, MultipleRevisionSources
45
from bzrlib.errors import NoSuchRevision
46
br1, br2 = make_branches()
193
47
revisions = br1.revision_history()
194
48
revisions_2 = br2.revision_history()
195
sources = MultipleRevisionSources(br1.repository, br2.repository)
196
expected_ancestors_list = {revisions[3]:(0, 0),
198
revisions_2[4]:(2, 1),
200
revisions_2[3]:(4, 2),
201
revisions[0]:(5, 3) }
202
ancestors_list = find_present_ancestors(revisions[3], sources)
203
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
204
for key, value in expected_ancestors_list.iteritems():
205
self.assertEqual(ancestors_list[key], value,
206
"key %r, %r != %r" % (key, ancestors_list[key],
208
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
210
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
212
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
214
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
216
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
218
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))
232
def test_combined(self):
234
Ensure it's not order-sensitive
236
br1, br2 = make_branches(self)
237
source = MultipleRevisionSources(br1.repository, br2.repository)
238
combined_1 = combined_graph(br1.last_revision(),
239
br2.last_revision(), source)
240
combined_2 = combined_graph(br2.last_revision(),
241
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
assert len(tree1.branch.revision_history()) > 0
312
rev_a = tree1.branch.repository.get_revision(tree1.branch.last_revision())
314
tree2 = self.make_branch_and_tree("br2")
315
tree2.commit(message=rev_a.message,
316
timestamp=rev_a.timestamp,
317
timezone=rev_a.timezone,
318
committer=rev_a.committer,
319
rev_id=rev_a.revision_id,
320
allow_pointless=True, # there's nothing in this commit
323
rev_b = tree2.branch.repository.get_revision(tree2.branch.last_revision())
325
self.assertEqual(rev_a.message, rev_b.message)
326
self.assertEqual(rev_a.timestamp, rev_b.timestamp)
327
self.assertEqual(rev_a.timezone, rev_b.timezone)
328
self.assertEqual(rev_a.committer, rev_b.committer)
329
self.assertEqual(rev_a.revision_id, rev_b.revision_id)
49
sources = MultipleRevisionSources(br1, br2)
51
assert is_ancestor(revisions[0], revisions[0], sources)
52
assert is_ancestor(revisions[1], revisions[0], sources)
53
assert not is_ancestor(revisions[0], revisions[1], sources)
54
assert is_ancestor(revisions_2[3], revisions[0], sources)
55
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
57
assert is_ancestor(revisions[3], revisions_2[4], sources)
58
assert is_ancestor(revisions[3], revisions_2[4], br1)
59
assert is_ancestor(revisions[3], revisions_2[3], sources)
60
assert not is_ancestor(revisions[3], revisions_2[3], br1)
added
removed
bzrlib/selftest/testrevision.py
