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 InTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
20
from bzrlib.selftest import TestCaseInTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
23
from bzrlib.fetch import fetch
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
25
is_ancestor, MultipleRevisionSources)
26
from bzrlib.trace import mutter
27
from bzrlib.errors import NoSuchRevision
29
# XXX: Make this a method of a merge base case
30
def make_branches(self):
31
"""Create two branches
33
branch 1 has 6 commits, branch 2 has 3 commits
34
commit 10 was a psuedo merge from branch 1
35
but has been disabled until ghost support is
48
so A is missing b6 at the start
49
and B is missing a3, a4, a5
24
51
os.mkdir("branch1")
25
br1 = Branch("branch1", init=True)
26
commit(br1, "Commit one")
27
commit(br1, "Commit two")
28
commit(br1, "Commit three")
52
br1 = Branch.initialize("branch1")
54
commit(br1, "Commit one", rev_id="a@u-0-0")
55
commit(br1, "Commit two", rev_id="a@u-0-1")
56
commit(br1, "Commit three", rev_id="a@u-0-2")
30
58
os.mkdir("branch2")
31
br2 = Branch("branch2", init=True)
59
br2 = Branch.initialize("branch2")
32
60
br2.update_revisions(br1)
33
commit(br2, "Commit four")
34
commit(br2, "Commit five")
61
commit(br2, "Commit four", rev_id="b@u-0-3")
62
commit(br2, "Commit five", rev_id="b@u-0-4")
35
63
revisions_2 = br2.revision_history()
65
fetch(from_branch=br2, to_branch=br1)
36
66
br1.add_pending_merge(revisions_2[4])
37
commit(br1, "Commit six")
67
self.assertEquals(revisions_2[4], 'b@u-0-4')
68
commit(br1, "Commit six", rev_id="a@u-0-3")
69
commit(br1, "Commit seven", rev_id="a@u-0-4")
70
commit(br2, "Commit eight", rev_id="b@u-0-5")
72
fetch(from_branch=br2, to_branch=br1)
73
br1.add_pending_merge(br2.revision_history()[5])
74
commit(br1, "Commit nine", rev_id="a@u-0-5")
75
# DO NOT FETCH HERE - we WANT a GHOST.
76
#fetch(from_branch=br1, to_branch=br2)
77
br2.add_pending_merge(br1.revision_history()[4])
78
commit(br2, "Commit ten - ghost merge", rev_id="b@u-0-6")
41
class TestIsAncestor(InTempDir):
83
class TestIsAncestor(TestCaseInTempDir):
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.get_ancestry(rev_id))
116
self.assertEquals(sorted(branch.get_ancestry(rev_id)),
117
[None] + sorted(anc))
43
120
def test_is_ancestor(self):
44
121
"""Test checking whether a revision is an ancestor of another revision"""
45
from bzrlib.revision import is_ancestor, MultipleRevisionSources
46
from bzrlib.errors import NoSuchRevision
47
br1, br2 = make_branches()
48
revisions = br1.revision_history()
49
revisions_2 = br2.revision_history()
50
sources = MultipleRevisionSources(br1, br2)
52
assert is_ancestor(revisions[0], revisions[0], sources)
53
assert is_ancestor(revisions[1], revisions[0], sources)
54
assert not is_ancestor(revisions[0], revisions[1], sources)
55
assert is_ancestor(revisions_2[3], revisions[0], sources)
56
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
58
assert is_ancestor(revisions[3], revisions_2[4], sources)
59
assert is_ancestor(revisions[3], revisions_2[4], br1)
60
assert is_ancestor(revisions[3], revisions_2[3], sources)
61
assert not is_ancestor(revisions[3], revisions_2[3], br1)
122
br1, br2 = make_branches(self)
123
revisions = br1.revision_history()
124
revisions_2 = br2.revision_history()
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(TestCaseInTempDir):
143
from bzrlib.commit import commit
144
TestCaseInTempDir.setUp(self)
145
self.br1, self.br2 = make_branches(self)
147
self.br2.commit("Commit eleven", rev_id="b@u-0-7")
148
self.br2.commit("Commit twelve", rev_id="b@u-0-8")
149
self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
151
fetch(from_branch=self.br2, to_branch=self.br1)
152
self.br1.add_pending_merge(self.br2.revision_history()[6])
153
self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
155
fetch(from_branch=self.br1, to_branch=self.br2)
156
self.br2.add_pending_merge(self.br1.revision_history()[6])
157
self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
159
from bzrlib.revision import MultipleRevisionSources
160
self.sources = MultipleRevisionSources(self.br1.storage,
163
def intervene(self, ancestor, revision, revision_history=None):
164
from bzrlib.revision import get_intervening_revisions
165
return get_intervening_revisions(ancestor,revision, self.sources,
168
def test_intervene(self):
169
"""Find intermediate revisions, without requiring history"""
170
from bzrlib.errors import NotAncestor, NoSuchRevision
171
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
172
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
173
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
174
['a@u-0-1', 'a@u-0-2'])
175
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
176
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
177
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
178
['b@u-0-4', 'a@u-0-3'])
179
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
180
self.br1.revision_history()),
182
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
183
self.br1.revision_history()),
184
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
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):
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(self)
216
revisions = br1.revision_history()
217
revisions_2 = br2.revision_history()
218
sources = br1.storage
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
self.assertEquals(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),
251
def test_common_ancestor(self):
252
"""Pick a reasonable merge base"""
253
from bzrlib.revision import common_ancestor
254
br1, br2 = make_branches(self)
255
revisions = br1.revision_history()
256
revisions_2 = br2.revision_history()
257
sources = MultipleRevisionSources(br1.storage, br2.storage)
258
expected_ancestors_list = {revisions[3]:(0, 0),
260
revisions_2[4]:(2, 1),
262
revisions_2[3]:(4, 2),
263
revisions[0]:(5, 3) }
264
ancestors_list = find_present_ancestors(revisions[3], sources)
265
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
266
for key, value in expected_ancestors_list.iteritems():
267
self.assertEqual(ancestors_list[key], value,
268
"key %r, %r != %r" % (key, ancestors_list[key],
270
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
272
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
274
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
276
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
278
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
280
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], 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
287
def test_combined(self):
289
Ensure it's not order-sensitive
291
br1, br2 = make_branches(self)
292
source = MultipleRevisionSources(br1.storage, br2.storage)
293
combined_1 = combined_graph(br1.last_revision(),
294
br2.last_revision(), source)
295
combined_2 = combined_graph(br2.last_revision(),
296
br1.last_revision(), source)
297
self.assertEquals(combined_1[1], combined_2[1])
298
self.assertEquals(combined_1[2], combined_2[2])
299
self.assertEquals(combined_1[3], combined_2[3])
300
self.assertEquals(combined_1, combined_2)
added
removed
bzrlib/selftest/testrevision.py
