1
# Copyright (C) 2005-2011 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
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 bzrlib.errors import (
26
InvalidLineInBugsProperty,
28
from bzrlib.revision import NULL_REVISION
29
from bzrlib.tests import TestCase, TestCaseWithTransport
30
from bzrlib.trace import mutter
32
# We're allowed to test deprecated interfaces
33
warnings.filterwarnings('ignore',
34
'.*get_intervening_revisions was deprecated',
36
r'bzrlib\.tests\.test_revision')
38
# XXX: Make this a method of a merge base case
39
def make_branches(self, format=None):
40
"""Create two branches
42
branch 1 has 6 commits, branch 2 has 3 commits
43
commit 10 is a ghosted merge merge from branch 1
55
so A is missing b6 at the start
56
and B is missing a3, a4, a5
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
revisions_2 = br2.revision_history()
70
self.assertEquals(revisions_2[-1], 'b@u-0-4')
72
tree1.merge_from_branch(br2)
73
tree1.commit("Commit six", rev_id="a@u-0-3")
74
tree1.commit("Commit seven", rev_id="a@u-0-4")
75
tree2.commit("Commit eight", rev_id="b@u-0-5")
76
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
78
tree1.merge_from_branch(br2)
79
tree1.commit("Commit nine", rev_id="a@u-0-5")
80
# DO NOT MERGE HERE - we WANT a GHOST.
81
tree2.add_parent_tree_id(br1.revision_history()[4])
82
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
87
class TestIsAncestor(TestCaseWithTransport):
89
def test_recorded_ancestry(self):
90
"""Test that commit records all ancestors"""
91
br1, br2 = make_branches(self)
92
d = [('a@u-0-0', ['a@u-0-0']),
93
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
94
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
95
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
96
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
98
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
100
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
101
'a@u-0-3', 'a@u-0-4']),
102
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
104
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
105
'b@u-0-3', 'b@u-0-4',
106
'b@u-0-5', 'a@u-0-5']),
107
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
108
'b@u-0-3', 'b@u-0-4',
109
'b@u-0-5', 'b@u-0-6']),
111
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
112
br2_only = ('b@u-0-6',)
113
for branch in br1, br2:
114
for rev_id, anc in d:
115
if rev_id in br1_only and not branch is br1:
117
if rev_id in br2_only and not branch is br2:
119
mutter('ancestry of {%s}: %r',
120
rev_id, branch.repository.get_ancestry(rev_id))
121
result = sorted(branch.repository.get_ancestry(rev_id))
122
self.assertEquals(result, [None] + sorted(anc))
125
class TestIntermediateRevisions(TestCaseWithTransport):
128
TestCaseWithTransport.setUp(self)
129
self.br1, self.br2 = make_branches(self)
130
wt1 = self.br1.bzrdir.open_workingtree()
131
wt2 = self.br2.bzrdir.open_workingtree()
132
wt2.commit("Commit eleven", rev_id="b@u-0-7")
133
wt2.commit("Commit twelve", rev_id="b@u-0-8")
134
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
136
wt1.merge_from_branch(self.br2)
137
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
139
wt2.merge_from_branch(self.br1)
140
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
143
class MockRevisionSource(object):
144
"""A RevisionSource that takes a pregenerated graph.
146
This is useful for testing revision graph algorithms where
147
the actual branch existing is irrelevant.
150
def __init__(self, full_graph):
151
self._full_graph = full_graph
153
def get_revision_graph_with_ghosts(self, revision_ids):
154
# This is mocked out to just return a constant graph.
155
return self._full_graph
158
class TestCommonAncestor(TestCaseWithTransport):
159
"""Test checking whether a revision is an ancestor of another revision"""
161
def test_get_history(self):
162
# TODO: test ghosts on the left hand branch's impact
163
# TODO: test ghosts on all parents, we should get some
164
# indicator. i.e. NULL_REVISION
166
tree = self.make_branch_and_tree('.')
167
tree.commit('1', rev_id = '1', allow_pointless=True)
168
tree.commit('2', rev_id = '2', allow_pointless=True)
169
tree.commit('3', rev_id = '3', allow_pointless=True)
170
rev = tree.branch.repository.get_revision('1')
171
history = rev.get_history(tree.branch.repository)
172
self.assertEqual([None, '1'], history)
173
rev = tree.branch.repository.get_revision('2')
174
history = rev.get_history(tree.branch.repository)
175
self.assertEqual([None, '1', '2'], history)
176
rev = tree.branch.repository.get_revision('3')
177
history = rev.get_history(tree.branch.repository)
178
self.assertEqual([None, '1', '2' ,'3'], history)
181
class TestReservedId(TestCase):
183
def test_is_reserved_id(self):
184
self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
185
self.assertEqual(True, revision.is_reserved_id(
186
revision.CURRENT_REVISION))
187
self.assertEqual(True, revision.is_reserved_id('arch:'))
188
self.assertEqual(False, revision.is_reserved_id('null'))
189
self.assertEqual(False, revision.is_reserved_id(
190
'arch:a@example.com/c--b--v--r'))
191
self.assertEqual(False, revision.is_reserved_id(None))
194
class TestRevisionMethods(TestCase):
196
def test_get_summary(self):
197
r = revision.Revision('1')
199
self.assertEqual('a', r.get_summary())
201
self.assertEqual('a', r.get_summary())
203
self.assertEqual('a', r.get_summary())
205
self.assertEqual('', r.get_summary())
207
def test_get_apparent_authors(self):
208
r = revision.Revision('1')
210
self.assertEqual(['A'], r.get_apparent_authors())
211
r.properties['author'] = 'B'
212
self.assertEqual(['B'], r.get_apparent_authors())
213
r.properties['authors'] = 'C\nD'
214
self.assertEqual(['C', 'D'], r.get_apparent_authors())
216
def test_get_apparent_authors_no_committer(self):
217
r = revision.Revision('1')
218
self.assertEqual([], r.get_apparent_authors())
221
class TestRevisionBugs(TestCase):
222
"""Tests for getting the bugs that a revision is linked to."""
224
def test_no_bugs(self):
225
r = revision.Revision('1')
226
self.assertEqual([], list(r.iter_bugs()))
228
def test_some_bugs(self):
229
r = revision.Revision(
231
'bugs': bugtracker.encode_fixes_bug_urls(
232
['http://example.com/bugs/1',
233
'http://launchpad.net/bugs/1234'])})
235
[('http://example.com/bugs/1', bugtracker.FIXED),
236
('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
239
def test_no_status(self):
240
r = revision.Revision(
241
'1', properties={'bugs': 'http://example.com/bugs/1'})
242
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
244
def test_too_much_information(self):
245
r = revision.Revision(
246
'1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
247
self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
249
def test_invalid_status(self):
250
r = revision.Revision(
251
'1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
252
self.assertRaises(InvalidBugStatus, list, r.iter_bugs())
added
removed
bzrlib/tests/test_revision.py
