1
# (C) 2005 Canonical Ltd
1
# Copyright (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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
20
26
from bzrlib.branch import Branch
21
from bzrlib.errors import NoSuchRevision
22
from bzrlib.commit import commit
23
from bzrlib.revision import (find_present_ancestors, combined_graph,
24
is_ancestor, MultipleRevisionSources)
25
from bzrlib.tests import TestCaseWithTransport
27
from bzrlib.errors import (
29
InvalidLineInBugsProperty,
32
from bzrlib.deprecated_graph import Graph
33
from bzrlib.revision import (find_present_ancestors,
35
from bzrlib.tests import TestCase, TestCaseWithTransport
26
36
from bzrlib.trace import mutter
27
37
from bzrlib.workingtree import WorkingTree
39
# We're allowed to test deprecated interfaces
40
warnings.filterwarnings('ignore',
41
'.*get_intervening_revisions was deprecated',
43
r'bzrlib\.tests\.test_revision')
29
45
# XXX: Make this a method of a merge base case
30
def make_branches(self):
46
def make_branches(self, format=None):
31
47
"""Create two branches
33
49
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
50
commit 10 is a ghosted merge merge from branch 1
38
52
the object graph is
43
57
b..3 a..3 merges b..4
48
62
so A is missing b6 at the start
49
63
and B is missing a3, a4, a5
51
tree1 = self.make_branch_and_tree("branch1")
65
tree1 = self.make_branch_and_tree("branch1", format=format)
54
68
tree1.commit("Commit one", rev_id="a@u-0-0")
55
69
tree1.commit("Commit two", rev_id="a@u-0-1")
56
70
tree1.commit("Commit three", rev_id="a@u-0-2")
58
tree2 = self.make_branch_and_tree("branch2")
72
tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
60
br2.update_revisions(br1)
61
74
tree2.commit("Commit four", rev_id="b@u-0-3")
62
75
tree2.commit("Commit five", rev_id="b@u-0-4")
63
76
revisions_2 = br2.revision_history()
66
tree1.add_pending_merge(revisions_2[4])
67
self.assertEquals(revisions_2[4], 'b@u-0-4')
77
self.assertEquals(revisions_2[-1], 'b@u-0-4')
79
tree1.merge_from_branch(br2)
68
80
tree1.commit("Commit six", rev_id="a@u-0-3")
69
81
tree1.commit("Commit seven", rev_id="a@u-0-4")
70
82
tree2.commit("Commit eight", rev_id="b@u-0-5")
73
tree1.add_pending_merge(br2.revision_history()[5])
83
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
85
tree1.merge_from_branch(br2)
74
86
tree1.commit("Commit nine", rev_id="a@u-0-5")
75
# DO NOT FETCH HERE - we WANT a GHOST.
77
tree2.add_pending_merge(br1.revision_history()[4])
87
# DO NOT MERGE HERE - we WANT a GHOST.
88
tree2.add_parent_tree_id(br1.revision_history()[4])
78
89
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
116
127
rev_id, branch.repository.get_ancestry(rev_id))
117
128
result = sorted(branch.repository.get_ancestry(rev_id))
118
129
self.assertEquals(result, [None] + sorted(anc))
121
def test_is_ancestor(self):
122
"""Test checking whether a revision is an ancestor of another revision"""
123
br1, br2 = make_branches(self)
124
revisions = br1.revision_history()
125
revisions_2 = br2.revision_history()
128
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
129
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
130
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
131
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
132
# disabled mbp 20050914, doesn't seem to happen anymore
133
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
134
## revisions[0], br1)
135
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
136
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
137
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
138
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
141
132
class TestIntermediateRevisions(TestCaseWithTransport):
144
from bzrlib.commit import commit
145
135
TestCaseWithTransport.setUp(self)
146
136
self.br1, self.br2 = make_branches(self)
147
137
wt1 = self.br1.bzrdir.open_workingtree()
150
140
wt2.commit("Commit twelve", rev_id="b@u-0-8")
151
141
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
153
self.br1.fetch(self.br2)
154
wt1.add_pending_merge(self.br2.revision_history()[6])
143
wt1.merge_from_branch(self.br2)
155
144
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
157
self.br2.fetch(self.br1)
158
wt2.add_pending_merge(self.br1.revision_history()[6])
146
wt2.merge_from_branch(self.br1)
159
147
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
161
from bzrlib.revision import MultipleRevisionSources
162
self.sources = MultipleRevisionSources(self.br1.repository,
165
def intervene(self, ancestor, revision, revision_history=None):
166
from bzrlib.revision import get_intervening_revisions
167
return get_intervening_revisions(ancestor,revision, self.sources,
170
def test_intervene(self):
171
"""Find intermediate revisions, without requiring history"""
172
from bzrlib.errors import NotAncestor, NoSuchRevision
173
self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
174
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
175
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
176
['a@u-0-1', 'a@u-0-2'])
177
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
178
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
179
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
180
['b@u-0-4', 'a@u-0-3'])
181
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
182
self.br1.revision_history()),
184
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
185
self.br1.revision_history()),
186
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
188
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
189
self.br1.revision_history()),
190
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
192
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
193
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
195
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
196
self.br2.revision_history()),
197
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
198
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
199
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
200
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
201
self.br2.revision_history()),
202
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
203
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
204
self.br2.revision_history())
205
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
206
'b@u-0-6', self.br2.revision_history())
207
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
208
'c@u-0-6', self.br2.revision_history())
150
class MockRevisionSource(object):
151
"""A RevisionSource that takes a pregenerated graph.
153
This is useful for testing revision graph algorithms where
154
the actual branch existing is irrelevant.
157
def __init__(self, full_graph):
158
self._full_graph = full_graph
160
def get_revision_graph_with_ghosts(self, revision_ids):
161
# This is mocked out to just return a constant graph.
162
return self._full_graph
211
165
class TestCommonAncestor(TestCaseWithTransport):
212
166
"""Test checking whether a revision is an ancestor of another revision"""
214
def test_old_common_ancestor(self):
215
"""Pick a resonable merge base using the old functionality"""
216
from bzrlib.revision import old_common_ancestor as common_ancestor
217
br1, br2 = make_branches(self)
218
revisions = br1.revision_history()
219
revisions_2 = br2.revision_history()
220
sources = br1.repository
222
expected_ancestors_list = {revisions[3]:(0, 0),
224
revisions_2[4]:(2, 1),
226
revisions_2[3]:(4, 2),
227
revisions[0]:(5, 3) }
228
ancestors_list = find_present_ancestors(revisions[3], sources)
229
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
230
for key, value in expected_ancestors_list.iteritems():
231
self.assertEqual(ancestors_list[key], value,
232
"key %r, %r != %r" % (key, ancestors_list[key],
235
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
237
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
239
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
241
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
243
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
245
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
248
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
249
revisions[4]) # revisions_2[5] is equally valid
250
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
253
def test_common_ancestor(self):
254
"""Pick a reasonable merge base"""
255
from bzrlib.revision import common_ancestor
256
br1, br2 = make_branches(self)
257
revisions = br1.revision_history()
258
revisions_2 = br2.revision_history()
259
sources = MultipleRevisionSources(br1.repository, br2.repository)
260
expected_ancestors_list = {revisions[3]:(0, 0),
262
revisions_2[4]:(2, 1),
264
revisions_2[3]:(4, 2),
265
revisions[0]:(5, 3) }
266
ancestors_list = find_present_ancestors(revisions[3], sources)
267
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
268
for key, value in expected_ancestors_list.iteritems():
269
self.assertEqual(ancestors_list[key], value,
270
"key %r, %r != %r" % (key, ancestors_list[key],
272
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
274
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
276
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
278
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
280
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
282
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
284
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
285
revisions[4]) # revisions_2[5] is equally valid
286
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
287
revisions[4]) # revisions_2[5] is equally valid
289
def test_combined(self):
291
Ensure it's not order-sensitive
293
br1, br2 = make_branches(self)
294
source = MultipleRevisionSources(br1.repository, br2.repository)
295
combined_1 = combined_graph(br1.last_revision(),
296
br2.last_revision(), source)
297
combined_2 = combined_graph(br2.last_revision(),
298
br1.last_revision(), source)
299
self.assertEquals(combined_1[1], combined_2[1])
300
self.assertEquals(combined_1[2], combined_2[2])
301
self.assertEquals(combined_1[3], combined_2[3])
302
self.assertEquals(combined_1, combined_2)
304
168
def test_get_history(self):
305
169
# TODO: test ghosts on the left hand branch's impact
306
170
# TODO: test ghosts on all parents, we should get some
319
183
rev = tree.branch.repository.get_revision('3')
320
184
history = rev.get_history(tree.branch.repository)
321
185
self.assertEqual([None, '1', '2' ,'3'], history)
188
class TestReservedId(TestCase):
190
def test_is_reserved_id(self):
191
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
192
self.assertEqual(True, revision.is_reserved_id(
193
revision.CURRENT_REVISION))
194
self.assertEqual(True, revision.is_reserved_id('arch:'))
195
self.assertEqual(False, revision.is_reserved_id('null'))
196
self.assertEqual(False, revision.is_reserved_id(
197
'arch:a@example.com/c--b--v--r'))
198
self.assertEqual(False, revision.is_reserved_id(None))
201
class TestRevisionMethods(TestCase):
203
def test_get_summary(self):
204
r = revision.Revision('1')
206
self.assertEqual('a', r.get_summary())
208
self.assertEqual('a', r.get_summary())
210
self.assertEqual('a', r.get_summary())
212
self.assertEqual('', r.get_summary())
214
def test_get_apparent_author(self):
215
r = revision.Revision('1')
217
author = self.applyDeprecated(
218
symbol_versioning.deprecated_in((1, 13, 0)),
219
r.get_apparent_author)
220
self.assertEqual('A', author)
221
r.properties['author'] = 'B'
222
author = self.applyDeprecated(
223
symbol_versioning.deprecated_in((1, 13, 0)),
224
r.get_apparent_author)
225
self.assertEqual('B', author)
226
r.properties['authors'] = 'C\nD'
227
author = self.applyDeprecated(
228
symbol_versioning.deprecated_in((1, 13, 0)),
229
r.get_apparent_author)
230
self.assertEqual('C', author)
232
def test_get_apparent_author_none(self):
233
r = revision.Revision('1')
234
author = self.applyDeprecated(
235
symbol_versioning.deprecated_in((1, 13, 0)),
236
r.get_apparent_author)
237
self.assertEqual(None, author)
239
def test_get_apparent_authors(self):
240
r = revision.Revision('1')
242
self.assertEqual(['A'], r.get_apparent_authors())
243
r.properties['author'] = 'B'
244
self.assertEqual(['B'], r.get_apparent_authors())
245
r.properties['authors'] = 'C\nD'
246
self.assertEqual(['C', 'D'], r.get_apparent_authors())
248
def test_get_apparent_authors_no_committer(self):
249
r = revision.Revision('1')
250
self.assertEqual([], r.get_apparent_authors())
253
class TestRevisionBugs(TestCase):
254
"""Tests for getting the bugs that a revision is linked to."""
256
def test_no_bugs(self):
257
r = revision.Revision('1')
258
self.assertEqual([], list(r.iter_bugs()))
260
def test_some_bugs(self):
261
r = revision.Revision(
263
'bugs': bugtracker.encode_fixes_bug_urls(
264
['http://example.com/bugs/1',
265
'http://launchpad.net/bugs/1234'])})
267
[('http://example.com/bugs/1', bugtracker.FIXED),
268
('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
271
def test_no_status(self):
272
r = revision.Revision(
273
'1', properties={'bugs': 'http://example.com/bugs/1'})
274
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
276
def test_too_much_information(self):
277
r = revision.Revision(
278
'1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
279
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
281
def test_invalid_status(self):
282
r = revision.Revision(
283
'1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
284
self.assertRaises(InvalidBugStatus, list, r.iter_bugs())
added
removed
bzrlib/tests/test_revision.py
