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)
20
from bzrlib.branch import Branch
21
from bzrlib.errors import NoSuchRevision
22
from bzrlib.commit import commit
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
# XXX: Make this a method of a merge base case
32
def make_branches(self):
33
"""Create two branches
35
branch 1 has 6 commits, branch 2 has 3 commits
36
commit 10 is a ghosted merge merge from branch 1
48
so A is missing b6 at the start
49
and B is missing a3, a4, a5
51
tree1 = self.make_branch_and_tree("branch1")
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")
54
tree1.commit("Commit one", rev_id="a@u-0-0")
55
tree1.commit("Commit two", rev_id="a@u-0-1")
56
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")
58
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
60
tree2.commit("Commit four", rev_id="b@u-0-3")
61
tree2.commit("Commit five", rev_id="b@u-0-4")
36
62
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")
65
tree1.add_pending_merge(revisions_2[4])
66
self.assertEquals(revisions_2[4], 'b@u-0-4')
67
tree1.commit("Commit six", rev_id="a@u-0-3")
68
tree1.commit("Commit seven", rev_id="a@u-0-4")
69
tree2.commit("Commit eight", rev_id="b@u-0-5")
72
tree1.add_pending_merge(br2.revision_history()[5])
73
tree1.commit("Commit nine", rev_id="a@u-0-5")
74
# DO NOT FETCH HERE - we WANT a GHOST.
76
tree2.add_pending_merge(br1.revision_history()[4])
77
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
48
class TestIsAncestor(TestCaseInTempDir):
82
class TestIsAncestor(TestCaseWithTransport):
84
def test_recorded_ancestry(self):
85
"""Test that commit records all ancestors"""
86
br1, br2 = make_branches(self)
87
d = [('a@u-0-0', ['a@u-0-0']),
88
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
89
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
90
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
91
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
93
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
95
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
96
'a@u-0-3', 'a@u-0-4']),
97
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
99
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
100
'b@u-0-3', 'b@u-0-4',
101
'b@u-0-5', 'a@u-0-5']),
102
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
103
'b@u-0-3', 'b@u-0-4',
104
'b@u-0-5', 'b@u-0-6']),
106
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
107
br2_only = ('b@u-0-6',)
108
for branch in br1, br2:
109
for rev_id, anc in d:
110
if rev_id in br1_only and not branch is br1:
112
if rev_id in br2_only and not branch is br2:
114
mutter('ancestry of {%s}: %r',
115
rev_id, branch.repository.get_ancestry(rev_id))
116
result = sorted(branch.repository.get_ancestry(rev_id))
117
self.assertEquals(result, [None] + sorted(anc))
49
120
def test_is_ancestor(self):
50
121
"""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()
122
br1, br2 = make_branches(self)
54
123
revisions = br1.revision_history()
55
124
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):
127
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
128
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
129
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
130
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
131
# disabled mbp 20050914, doesn't seem to happen anymore
132
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
133
## revisions[0], br1)
134
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
135
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
136
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
137
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
140
class TestIntermediateRevisions(TestCaseWithTransport):
72
143
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")
144
TestCaseWithTransport.setUp(self)
145
self.br1, self.br2 = make_branches(self)
146
wt1 = self.br1.bzrdir.open_workingtree()
147
wt2 = self.br2.bzrdir.open_workingtree()
148
wt2.commit("Commit eleven", rev_id="b@u-0-7")
149
wt2.commit("Commit twelve", rev_id="b@u-0-8")
150
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
152
self.br1.fetch(self.br2)
153
wt1.add_pending_merge(self.br2.revision_history()[6])
154
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
156
self.br2.fetch(self.br1)
157
wt2.add_pending_merge(self.br1.revision_history()[6])
158
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
83
160
from bzrlib.revision import MultipleRevisionSources
84
self.sources = MultipleRevisionSources(self.br1, self.br2)
161
self.sources = MultipleRevisionSources(self.br1.repository,
86
164
def intervene(self, ancestor, revision, revision_history=None):
87
165
from bzrlib.revision import get_intervening_revisions
166
256
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
168
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
170
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
258
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
259
(revisions[4], revisions_2[5]))
260
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
261
(revisions[4], revisions_2[5]))
262
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
264
def test_combined(self):
266
Ensure it's not order-sensitive
268
br1, br2 = make_branches(self)
269
source = MultipleRevisionSources(br1.repository, br2.repository)
270
combined_1 = combined_graph(br1.last_revision(),
271
br2.last_revision(), source)
272
combined_2 = combined_graph(br2.last_revision(),
273
br1.last_revision(), source)
274
self.assertEquals(combined_1[1], combined_2[1])
275
self.assertEquals(combined_1[2], combined_2[2])
276
self.assertEquals(combined_1[3], combined_2[3])
277
self.assertEquals(combined_1, combined_2)
279
def test_get_history(self):
280
# TODO: test ghosts on the left hand branch's impact
281
# TODO: test ghosts on all parents, we should get some
282
# indicator. i.e. NULL_REVISION
284
tree = self.make_branch_and_tree('.')
285
tree.commit('1', rev_id = '1', allow_pointless=True)
286
tree.commit('2', rev_id = '2', allow_pointless=True)
287
tree.commit('3', rev_id = '3', allow_pointless=True)
288
rev = tree.branch.repository.get_revision('1')
289
history = rev.get_history(tree.branch.repository)
290
self.assertEqual([None, '1'], history)
291
rev = tree.branch.repository.get_revision('2')
292
history = rev.get_history(tree.branch.repository)
293
self.assertEqual([None, '1', '2'], history)
294
rev = tree.branch.repository.get_revision('3')
295
history = rev.get_history(tree.branch.repository)
296
self.assertEqual([None, '1', '2' ,'3'], history)
298
def test_common_ancestor_rootless_graph(self):
299
# common_ancestor on a graph with no reachable roots - only
300
# ghosts - should still return a useful value.
302
# add a ghost node which would be a root if it wasn't a ghost.
303
graph.add_ghost('a_ghost')
304
# add a normal commit on top of that
305
graph.add_node('rev1', ['a_ghost'])
306
# add a left-branch revision
307
graph.add_node('left', ['rev1'])
308
# add a right-branch revision
309
graph.add_node('right', ['rev1'])
310
source = MockRevisionSource(graph)
311
self.assertEqual('rev1', common_ancestor('left', 'right', source))
314
class TestMultipleRevisionSources(TestCaseWithTransport):
315
"""Tests for the MultipleRevisionSources adapter."""
317
def test_get_revision_graph_merges_ghosts(self):
318
# when we ask for the revision graph for B, which
319
# is in repo 1 with a ghost of A, and which is not
320
# in repo 2, which has A, the revision_graph()
321
# should return A and B both.
322
tree_1 = self.make_branch_and_tree('1')
323
tree_1.add_pending_merge('A')
324
tree_1.commit('foo', rev_id='B', allow_pointless=True)
325
tree_2 = self.make_branch_and_tree('2')
326
tree_2.commit('bar', rev_id='A', allow_pointless=True)
327
source = MultipleRevisionSources(tree_1.branch.repository,
328
tree_2.branch.repository)
329
self.assertEqual({'B':['A'],
331
source.get_revision_graph('B'))