1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
1
# (C) 2005 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
8
8
# This program is distributed in the hope that it will be useful,
9
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
11
# GNU General Public License for more details.
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
24
from breezy.revision import NULL_REVISION
25
from breezy.tests import TestCase, TestCaseWithTransport
26
from breezy.tests.matchers import MatchesAncestry
28
# We're allowed to test deprecated interfaces
29
warnings.filterwarnings('ignore',
30
'.*get_intervening_revisions was deprecated',
32
r'breezy\.tests\.test_revision')
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
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
34
31
# XXX: Make this a method of a merge base case
37
def make_branches(self, format=None):
32
def make_branches(self):
38
33
"""Create two branches
40
35
branch 1 has 6 commits, branch 2 has 3 commits
53
48
so A is missing b6 at the start
54
49
and B is missing a3, a4, a5
56
tree1 = self.make_branch_and_tree("branch1", format=format)
51
tree1 = self.make_branch_and_tree("branch1")
59
tree1.commit("Commit one", rev_id=b"a@u-0-0")
60
tree1.commit("Commit two", rev_id=b"a@u-0-1")
61
tree1.commit("Commit three", rev_id=b"a@u-0-2")
63
tree2 = tree1.controldir.sprout("branch2").open_workingtree()
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")
58
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
65
tree2.commit("Commit four", rev_id=b"b@u-0-3")
66
tree2.commit("Commit five", rev_id=b"b@u-0-4")
67
self.assertEqual(br2.last_revision(), b'b@u-0-4')
69
tree1.merge_from_branch(br2)
70
tree1.commit("Commit six", rev_id=b"a@u-0-3")
71
tree1.commit("Commit seven", rev_id=b"a@u-0-4")
72
tree2.commit("Commit eight", rev_id=b"b@u-0-5")
73
self.assertEqual(br2.last_revision(), b'b@u-0-5')
75
tree1.merge_from_branch(br2)
76
tree1.commit("Commit nine", rev_id=b"a@u-0-5")
77
# DO NOT MERGE HERE - we WANT a GHOST.
80
graph = br1.repository.get_graph()
81
revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
82
[revision.NULL_REVISION]))
86
tree2.add_parent_tree_id(revhistory[4])
87
tree2.commit("Commit ten - ghost merge", rev_id=b"b@u-0-6")
60
tree2.commit("Commit four", rev_id="b@u-0-3")
61
tree2.commit("Commit five", rev_id="b@u-0-4")
62
revisions_2 = br2.revision_history()
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")
94
84
def test_recorded_ancestry(self):
95
85
"""Test that commit records all ancestors"""
96
86
br1, br2 = make_branches(self)
97
d = [(b'a@u-0-0', [b'a@u-0-0']),
98
(b'a@u-0-1', [b'a@u-0-0', b'a@u-0-1']),
99
(b'a@u-0-2', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2']),
100
(b'b@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3']),
101
(b'b@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3',
103
(b'a@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
105
(b'a@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
106
b'a@u-0-3', b'a@u-0-4']),
107
(b'b@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
109
(b'a@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-3', b'a@u-0-4',
110
b'b@u-0-3', b'b@u-0-4',
111
b'b@u-0-5', b'a@u-0-5']),
112
(b'b@u-0-6', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-4',
113
b'b@u-0-3', b'b@u-0-4',
114
b'b@u-0-5', b'b@u-0-6']),
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']),
116
br1_only = (b'a@u-0-3', b'a@u-0-4', b'a@u-0-5')
117
br2_only = (b'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',)
118
108
for branch in br1, br2:
119
109
for rev_id, anc in d:
120
if rev_id in br1_only and branch is not br1:
122
if rev_id in br2_only and branch is not br2:
125
MatchesAncestry(branch.repository, rev_id))
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))
120
def test_is_ancestor(self):
121
"""Test checking whether a revision is an ancestor of another revision"""
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))
128
140
class TestIntermediateRevisions(TestCaseWithTransport):
143
from bzrlib.commit import commit
131
144
TestCaseWithTransport.setUp(self)
132
145
self.br1, self.br2 = make_branches(self)
133
wt1 = self.br1.controldir.open_workingtree()
134
wt2 = self.br2.controldir.open_workingtree()
135
wt2.commit("Commit eleven", rev_id=b"b@u-0-7")
136
wt2.commit("Commit twelve", rev_id=b"b@u-0-8")
137
wt2.commit("Commit thirtteen", rev_id=b"b@u-0-9")
139
wt1.merge_from_branch(self.br2)
140
wt1.commit("Commit fourtten", rev_id=b"a@u-0-6")
142
wt2.merge_from_branch(self.br1)
143
wt2.commit("Commit fifteen", rev_id=b"b@u-0-10")
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")
160
from bzrlib.revision import MultipleRevisionSources
161
self.sources = MultipleRevisionSources(self.br1.repository,
164
def intervene(self, ancestor, revision, revision_history=None):
165
from bzrlib.revision import get_intervening_revisions
166
return get_intervening_revisions(ancestor,revision, self.sources,
169
def test_intervene(self):
170
"""Find intermediate revisions, without requiring history"""
171
from bzrlib.errors import NotAncestor, NoSuchRevision
172
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
173
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
174
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
175
['a@u-0-1', 'a@u-0-2'])
176
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
177
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
178
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
179
['b@u-0-4', 'a@u-0-3'])
180
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
181
self.br1.revision_history()),
183
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
184
self.br1.revision_history()),
185
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
187
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
188
self.br1.revision_history()),
189
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
191
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
192
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
194
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
195
self.br2.revision_history()),
196
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
197
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
198
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
199
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
200
self.br2.revision_history()),
201
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
202
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
203
self.br2.revision_history())
204
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
205
'b@u-0-6', self.br2.revision_history())
206
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
207
'c@u-0-6', self.br2.revision_history())
146
210
class MockRevisionSource(object):
161
225
class TestCommonAncestor(TestCaseWithTransport):
162
226
"""Test checking whether a revision is an ancestor of another revision"""
228
def test_common_ancestor(self):
229
"""Pick a reasonable merge base"""
230
br1, br2 = make_branches(self)
231
revisions = br1.revision_history()
232
revisions_2 = br2.revision_history()
233
sources = MultipleRevisionSources(br1.repository, br2.repository)
234
expected_ancestors_list = {revisions[3]:(0, 0),
236
revisions_2[4]:(2, 1),
238
revisions_2[3]:(4, 2),
239
revisions[0]:(5, 3) }
240
ancestors_list = find_present_ancestors(revisions[3], sources)
241
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
242
for key, value in expected_ancestors_list.iteritems():
243
self.assertEqual(ancestors_list[key], value,
244
"key %r, %r != %r" % (key, ancestors_list[key],
246
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
248
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
250
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
252
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
254
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
256
self.assertEqual(common_ancestor(revisions[4], revisions_2[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)
164
279
def test_get_history(self):
165
280
# TODO: test ghosts on the left hand branch's impact
166
281
# TODO: test ghosts on all parents, we should get some
167
282
# indicator. i.e. NULL_REVISION
169
284
tree = self.make_branch_and_tree('.')
170
tree.commit('1', rev_id=b'1', allow_pointless=True)
171
tree.commit('2', rev_id=b'2', allow_pointless=True)
172
tree.commit('3', rev_id=b'3', allow_pointless=True)
173
rev = tree.branch.repository.get_revision(b'1')
174
history = rev.get_history(tree.branch.repository)
175
self.assertEqual([None, b'1'], history)
176
rev = tree.branch.repository.get_revision(b'2')
177
history = rev.get_history(tree.branch.repository)
178
self.assertEqual([None, b'1', b'2'], history)
179
rev = tree.branch.repository.get_revision(b'3')
180
history = rev.get_history(tree.branch.repository)
181
self.assertEqual([None, b'1', b'2', b'3'], history)
184
class TestReservedId(TestCase):
186
def test_is_reserved_id(self):
187
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
188
self.assertEqual(True, revision.is_reserved_id(
189
revision.CURRENT_REVISION))
190
self.assertEqual(True, revision.is_reserved_id(b'arch:'))
191
self.assertEqual(False, revision.is_reserved_id(b'null'))
192
self.assertEqual(False, revision.is_reserved_id(
193
b'arch:a@example.com/c--b--v--r'))
194
self.assertEqual(False, revision.is_reserved_id(None))
197
class TestRevisionMethods(TestCase):
199
def test_get_summary(self):
200
r = revision.Revision('1')
202
self.assertEqual('a', r.get_summary())
204
self.assertEqual('a', r.get_summary())
206
self.assertEqual('a', r.get_summary())
208
self.assertEqual('', r.get_summary())
210
def test_get_apparent_authors(self):
211
r = revision.Revision('1')
213
self.assertEqual(['A'], r.get_apparent_authors())
214
r.properties[u'author'] = 'B'
215
self.assertEqual(['B'], r.get_apparent_authors())
216
r.properties[u'authors'] = 'C\nD'
217
self.assertEqual(['C', 'D'], r.get_apparent_authors())
219
def test_get_apparent_authors_no_committer(self):
220
r = revision.Revision('1')
221
self.assertEqual([], r.get_apparent_authors())
224
class TestRevisionBugs(TestCase):
225
"""Tests for getting the bugs that a revision is linked to."""
227
def test_no_bugs(self):
228
r = revision.Revision('1')
229
self.assertEqual([], list(r.iter_bugs()))
231
def test_some_bugs(self):
232
r = revision.Revision(
234
u'bugs': bugtracker.encode_fixes_bug_urls(
235
[('http://example.com/bugs/1', 'fixed'),
236
('http://launchpad.net/bugs/1234', 'fixed')])})
238
[('http://example.com/bugs/1', bugtracker.FIXED),
239
('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
242
def test_no_status(self):
243
r = revision.Revision(
244
'1', properties={u'bugs': 'http://example.com/bugs/1'})
245
self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
248
def test_too_much_information(self):
249
r = revision.Revision(
250
'1', properties={u'bugs': 'http://example.com/bugs/1 fixed bar'})
251
self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
254
def test_invalid_status(self):
255
r = revision.Revision(
256
'1', properties={u'bugs': 'http://example.com/bugs/1 faxed'})
257
self.assertRaises(bugtracker.InvalidBugStatus, list, r.iter_bugs())
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'))
added
removed
bzrlib/tests/test_revision.py
