47
55
so A is missing b6 at the start
48
56
and B is missing a3, a4, a5
51
br1 = Branch.initialize("branch1")
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")
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")
62
revisions_2 = br2.revision_history()
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")
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")
74
# DO NOT FETCH HERE - we WANT a GHOST.
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")
58
tree1 = self.make_branch_and_tree("branch1", format=format)
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.sprout("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")
69
self.assertEquals(br2.last_revision(), 'b@u-0-4')
71
tree1.merge_from_branch(br2)
72
tree1.commit("Commit six", rev_id="a@u-0-3")
73
tree1.commit("Commit seven", rev_id="a@u-0-4")
74
tree2.commit("Commit eight", rev_id="b@u-0-5")
75
self.assertEquals(br2.last_revision(), 'b@u-0-5')
77
tree1.merge_from_branch(br2)
78
tree1.commit("Commit nine", rev_id="a@u-0-5")
79
# DO NOT MERGE HERE - we WANT a GHOST.
82
graph = br1.repository.get_graph()
83
revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
84
[revision.NULL_REVISION]))
88
tree2.add_parent_tree_id(revhistory[4])
89
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
82
class TestIsAncestor(TestCaseInTempDir):
94
class TestIsAncestor(TestCaseWithTransport):
83
96
def test_recorded_ancestry(self):
84
97
"""Test that commit records all ancestors"""
85
br1, br2 = make_branches()
98
br1, br2 = make_branches(self)
86
99
d = [('a@u-0-0', ['a@u-0-0']),
87
100
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
88
101
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
111
124
if rev_id in br2_only and not branch is br2:
113
mutter('ancestry of {%s}: %r',
114
rev_id, branch.get_ancestry(rev_id))
115
self.assertEquals(sorted(branch.get_ancestry(rev_id)),
116
[None] + sorted(anc))
119
def test_is_ancestor(self):
120
"""Test checking whether a revision is an ancestor of another revision"""
121
br1, br2 = make_branches()
122
revisions = br1.revision_history()
123
revisions_2 = br2.revision_history()
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)
130
# disabled mbp 20050914, doesn't seem to happen anymore
131
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
132
## revisions[0], br1)
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):
127
MatchesAncestry(branch.repository, rev_id))
130
class TestIntermediateRevisions(TestCaseWithTransport):
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")
158
from bzrlib.revision import MultipleRevisionSources
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):
133
TestCaseWithTransport.setUp(self)
134
self.br1, self.br2 = make_branches(self)
135
wt1 = self.br1.bzrdir.open_workingtree()
136
wt2 = self.br2.bzrdir.open_workingtree()
137
wt2.commit("Commit eleven", rev_id="b@u-0-7")
138
wt2.commit("Commit twelve", rev_id="b@u-0-8")
139
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
141
wt1.merge_from_branch(self.br2)
142
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
144
wt2.merge_from_branch(self.br1)
145
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
148
class MockRevisionSource(object):
149
"""A RevisionSource that takes a pregenerated graph.
151
This is useful for testing revision graph algorithms where
152
the actual branch existing is irrelevant.
155
def __init__(self, full_graph):
156
self._full_graph = full_graph
158
def get_revision_graph_with_ghosts(self, revision_ids):
159
# This is mocked out to just return a constant graph.
160
return self._full_graph
163
class TestCommonAncestor(TestCaseWithTransport):
210
164
"""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),
251
def test_common_ancestor(self):
252
"""Pick a reasonable merge base"""
253
from bzrlib.revision import common_ancestor
254
br1, br2 = make_branches()
255
revisions = br1.revision_history()
256
revisions_2 = br2.revision_history()
257
sources = MultipleRevisionSources(br1, br2)
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
assert 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()
292
source = MultipleRevisionSources(br1, br2)
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
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
166
def test_get_history(self):
167
# TODO: test ghosts on the left hand branch's impact
168
# TODO: test ghosts on all parents, we should get some
169
# indicator. i.e. NULL_REVISION
171
tree = self.make_branch_and_tree('.')
172
tree.commit('1', rev_id = '1', allow_pointless=True)
173
tree.commit('2', rev_id = '2', allow_pointless=True)
174
tree.commit('3', rev_id = '3', allow_pointless=True)
175
rev = tree.branch.repository.get_revision('1')
176
history = rev.get_history(tree.branch.repository)
177
self.assertEqual([None, '1'], history)
178
rev = tree.branch.repository.get_revision('2')
179
history = rev.get_history(tree.branch.repository)
180
self.assertEqual([None, '1', '2'], history)
181
rev = tree.branch.repository.get_revision('3')
182
history = rev.get_history(tree.branch.repository)
183
self.assertEqual([None, '1', '2' ,'3'], history)
186
class TestReservedId(TestCase):
188
def test_is_reserved_id(self):
189
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
190
self.assertEqual(True, revision.is_reserved_id(
191
revision.CURRENT_REVISION))
192
self.assertEqual(True, revision.is_reserved_id('arch:'))
193
self.assertEqual(False, revision.is_reserved_id('null'))
194
self.assertEqual(False, revision.is_reserved_id(
195
'arch:a@example.com/c--b--v--r'))
196
self.assertEqual(False, revision.is_reserved_id(None))
199
class TestRevisionMethods(TestCase):
201
def test_get_summary(self):
202
r = revision.Revision('1')
204
self.assertEqual('a', r.get_summary())
206
self.assertEqual('a', r.get_summary())
208
self.assertEqual('a', r.get_summary())
210
self.assertEqual('', r.get_summary())
212
def test_get_apparent_authors(self):
213
r = revision.Revision('1')
215
self.assertEqual(['A'], r.get_apparent_authors())
216
r.properties['author'] = 'B'
217
self.assertEqual(['B'], r.get_apparent_authors())
218
r.properties['authors'] = 'C\nD'
219
self.assertEqual(['C', 'D'], r.get_apparent_authors())
221
def test_get_apparent_authors_no_committer(self):
222
r = revision.Revision('1')
223
self.assertEqual([], r.get_apparent_authors())
226
class TestRevisionBugs(TestCase):
227
"""Tests for getting the bugs that a revision is linked to."""
229
def test_no_bugs(self):
230
r = revision.Revision('1')
231
self.assertEqual([], list(r.iter_bugs()))
233
def test_some_bugs(self):
234
r = revision.Revision(
236
'bugs': bugtracker.encode_fixes_bug_urls(
237
['http://example.com/bugs/1',
238
'http://launchpad.net/bugs/1234'])})
240
[('http://example.com/bugs/1', bugtracker.FIXED),
241
('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
244
def test_no_status(self):
245
r = revision.Revision(
246
'1', properties={'bugs': 'http://example.com/bugs/1'})
247
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
249
def test_too_much_information(self):
250
r = revision.Revision(
251
'1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
252
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
254
def test_invalid_status(self):
255
r = revision.Revision(
256
'1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
257
self.assertRaises(InvalidBugStatus, list, r.iter_bugs())