1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
|
# (C) 2005 Canonical Ltd
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
import os
from bzrlib.selftest import TestCaseInTempDir
from bzrlib.branch import Branch
from bzrlib.commit import commit
from bzrlib.fetch import fetch
from bzrlib.revision import (find_present_ancestors, combined_graph,
is_ancestor, MultipleRevisionSources)
from bzrlib.trace import mutter
from bzrlib.errors import NoSuchRevision
def make_branches():
os.mkdir("branch1")
br1 = Branch.initialize("branch1")
commit(br1, "Commit one", rev_id="a@u-0-0")
commit(br1, "Commit two", rev_id="a@u-0-1")
commit(br1, "Commit three", rev_id="a@u-0-2")
os.mkdir("branch2")
br2 = Branch.initialize("branch2")
br2.update_revisions(br1)
commit(br2, "Commit four", rev_id="b@u-0-3")
commit(br2, "Commit five", rev_id="b@u-0-4")
revisions_2 = br2.revision_history()
fetch(from_branch=br2, to_branch=br1)
br1.add_pending_merge(revisions_2[4])
assert revisions_2[4] == 'b@u-0-4'
commit(br1, "Commit six", rev_id="a@u-0-3")
commit(br1, "Commit seven", rev_id="a@u-0-4")
commit(br2, "Commit eight", rev_id="b@u-0-5")
fetch(from_branch=br2, to_branch=br1)
br1.add_pending_merge(br2.revision_history()[5])
commit(br1, "Commit nine", rev_id="a@u-0-5")
fetch(from_branch=br1, to_branch=br2)
br2.add_pending_merge(br1.revision_history()[4])
commit(br2, "Commit ten", rev_id="b@u-0-6")
fetch(from_branch=br2, to_branch=br1)
return br1, br2
class TestIsAncestor(TestCaseInTempDir):
def test_recorded_ancestry(self):
"""Test that commit records all ancestors"""
br1, br2 = make_branches()
d = [('a@u-0-0', ['a@u-0-0']),
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
'b@u-0-4']),
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
'a@u-0-3']),
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
'a@u-0-3', 'a@u-0-4']),
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
'b@u-0-5']),
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
'b@u-0-3', 'b@u-0-4',
'b@u-0-5', 'a@u-0-5']),
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
'b@u-0-3', 'b@u-0-4',
'b@u-0-5', 'b@u-0-6']),
]
for branch in br1, br2:
for rev_id, anc in d:
mutter('ancestry of {%s}: %r',
rev_id, branch.get_ancestry(rev_id))
self.assertEquals(sorted(branch.get_ancestry(rev_id)),
[None] + sorted(anc))
def test_is_ancestor(self):
"""Test checking whether a revision is an ancestor of another revision"""
br1, br2 = make_branches()
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
sources = br1
assert is_ancestor(revisions[0], revisions[0], br1)
assert is_ancestor(revisions[1], revisions[0], sources)
assert not is_ancestor(revisions[0], revisions[1], sources)
assert is_ancestor(revisions_2[3], revisions[0], sources)
# disabled mbp 20050914, doesn't seem to happen anymore
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
## revisions[0], br1)
assert is_ancestor(revisions[3], revisions_2[4], sources)
assert is_ancestor(revisions[3], revisions_2[4], br1)
assert is_ancestor(revisions[3], revisions_2[3], sources)
## assert not is_ancestor(revisions[3], revisions_2[3], br1)
class TestIntermediateRevisions(TestCaseInTempDir):
def setUp(self):
from bzrlib.commit import commit
TestCaseInTempDir.setUp(self)
self.br1, self.br2 = make_branches()
self.br2.commit("Commit eleven", rev_id="b@u-0-7")
self.br2.commit("Commit twelve", rev_id="b@u-0-8")
self.br2.commit("Commit thirtteen", rev_id="b@u-0-9")
fetch(from_branch=self.br2, to_branch=self.br1)
self.br1.add_pending_merge(self.br2.revision_history()[6])
self.br1.commit("Commit fourtten", rev_id="a@u-0-6")
fetch(from_branch=self.br1, to_branch=self.br2)
self.br2.add_pending_merge(self.br1.revision_history()[6])
self.br2.commit("Commit fifteen", rev_id="b@u-0-10")
from bzrlib.revision import MultipleRevisionSources
self.sources = MultipleRevisionSources(self.br1, self.br2)
def intervene(self, ancestor, revision, revision_history=None):
from bzrlib.revision import get_intervening_revisions
return get_intervening_revisions(ancestor,revision, self.sources,
revision_history)
def test_intervene(self):
"""Find intermediate revisions, without requiring history"""
from bzrlib.errors import NotAncestor, NoSuchRevision
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
['a@u-0-1', 'a@u-0-2'])
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
['b@u-0-4', 'a@u-0-3'])
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
self.br1.revision_history()),
['a@u-0-3'])
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
self.br1.revision_history()),
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
'a@u-0-5'])
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
self.br1.revision_history()),
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
'b@u-0-6'])
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
'b@u-0-5'])
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
self.br2.revision_history()),
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
self.br2.revision_history()),
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
self.br2.revision_history())
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
'b@u-0-6', self.br2.revision_history())
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
'c@u-0-6', self.br2.revision_history())
class TestCommonAncestor(TestCaseInTempDir):
"""Test checking whether a revision is an ancestor of another revision"""
def test_old_common_ancestor(self):
"""Pick a resonable merge base using the old functionality"""
from bzrlib.revision import old_common_ancestor as common_ancestor
br1, br2 = make_branches()
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
sources = br1
expected_ancestors_list = {revisions[3]:(0, 0),
revisions[2]:(1, 1),
revisions_2[4]:(2, 1),
revisions[1]:(3, 2),
revisions_2[3]:(4, 2),
revisions[0]:(5, 3) }
ancestors_list = find_present_ancestors(revisions[3], sources)
assert len(expected_ancestors_list) == len(ancestors_list)
for key, value in expected_ancestors_list.iteritems():
self.assertEqual(ancestors_list[key], value,
"key %r, %r != %r" % (key, ancestors_list[key],
value))
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
revisions[0])
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
revisions[2])
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
revisions[4])
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
revisions_2[5])
def test_common_ancestor(self):
"""Pick a reasonable merge base"""
from bzrlib.revision import common_ancestor
br1, br2 = make_branches()
revisions = br1.revision_history()
revisions_2 = br2.revision_history()
sources = MultipleRevisionSources(br1, br2)
expected_ancestors_list = {revisions[3]:(0, 0),
revisions[2]:(1, 1),
revisions_2[4]:(2, 1),
revisions[1]:(3, 2),
revisions_2[3]:(4, 2),
revisions[0]:(5, 3) }
ancestors_list = find_present_ancestors(revisions[3], sources)
assert len(expected_ancestors_list) == len(ancestors_list)
for key, value in expected_ancestors_list.iteritems():
self.assertEqual(ancestors_list[key], value,
"key %r, %r != %r" % (key, ancestors_list[key],
value))
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
revisions[0])
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
revisions[1])
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
revisions[2])
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
revisions_2[4])
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
revisions[4])
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
revisions[4])
def test_combined(self):
"""combined_graph
Ensure it's not order-sensitive
"""
br1, br2 = make_branches()
source = MultipleRevisionSources(br1, br2)
combined_1 = combined_graph(br1.last_revision(),
br2.last_revision(), source)
combined_2 = combined_graph(br2.last_revision(),
br1.last_revision(), source)
assert combined_1[1] == combined_2[1]
assert combined_1[2] == combined_2[2]
assert combined_1[3] == combined_2[3]
assert combined_1 == combined_2
|