1
# (C) 2005 Canonical Ltd
1
# Copyright (C) 2005-2011 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
17
from bzrlib.selftest import TestCaseInTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
27
commit(br1, "Commit one", rev_id="a@u-0-0")
28
commit(br1, "Commit two", rev_id="a@u-0-1")
29
commit(br1, "Commit three", rev_id="a@u-0-2")
32
br2 = Branch("branch2", init=True)
33
br2.update_revisions(br1)
34
commit(br2, "Commit four", rev_id="b@u-0-3")
35
commit(br2, "Commit five", rev_id="b@u-0-4")
36
revisions_2 = br2.revision_history()
37
br1.add_pending_merge(revisions_2[4])
38
commit(br1, "Commit six", rev_id="a@u-0-3")
39
commit(br1, "Commit seven", rev_id="a@u-0-4")
40
commit(br2, "Commit eight", rev_id="b@u-0-5")
41
br1.add_pending_merge(br2.revision_history()[5])
42
commit(br1, "Commit nine", rev_id="a@u-0-5")
43
br2.add_pending_merge(br1.revision_history()[4])
44
commit(br2, "Commit ten", rev_id="b@u-0-6")
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.tests.matchers import MatchesAncestry
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
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")
48
class TestIsAncestor(TestCaseInTempDir):
49
def test_is_ancestor(self):
50
"""Test checking whether a revision is an ancestor of another revision"""
51
from bzrlib.revision import is_ancestor, MultipleRevisionSources
52
from bzrlib.errors import NoSuchRevision
53
br1, br2 = make_branches()
54
revisions = br1.revision_history()
55
revisions_2 = br2.revision_history()
56
sources = MultipleRevisionSources(br1, br2)
58
assert is_ancestor(revisions[0], revisions[0], sources)
59
assert is_ancestor(revisions[1], revisions[0], sources)
60
assert not is_ancestor(revisions[0], revisions[1], sources)
61
assert is_ancestor(revisions_2[3], revisions[0], sources)
62
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
64
assert is_ancestor(revisions[3], revisions_2[4], sources)
65
assert is_ancestor(revisions[3], revisions_2[4], br1)
66
assert is_ancestor(revisions[3], revisions_2[3], sources)
67
assert not is_ancestor(revisions[3], revisions_2[3], br1)
69
class TestIntermediateRevisions(TestCaseInTempDir):
94
class TestIsAncestor(TestCaseWithTransport):
96
def test_recorded_ancestry(self):
97
"""Test that commit records all ancestors"""
98
br1, br2 = make_branches(self)
99
d = [('a@u-0-0', ['a@u-0-0']),
100
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
101
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
102
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
103
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
105
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
107
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
108
'a@u-0-3', 'a@u-0-4']),
109
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
111
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
112
'b@u-0-3', 'b@u-0-4',
113
'b@u-0-5', 'a@u-0-5']),
114
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-4',
115
'b@u-0-3', 'b@u-0-4',
116
'b@u-0-5', 'b@u-0-6']),
118
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
119
br2_only = ('b@u-0-6',)
120
for branch in br1, br2:
121
for rev_id, anc in d:
122
if rev_id in br1_only and not branch is br1:
124
if rev_id in br2_only and not branch is br2:
127
MatchesAncestry(branch.repository, rev_id))
130
class TestIntermediateRevisions(TestCaseWithTransport):
72
from bzrlib.commit import commit
73
TestCaseInTempDir.setUp(self)
74
self.br1, self.br2 = make_branches()
75
commit(self.br2, "Commit eleven", rev_id="b@u-0-7")
76
commit(self.br2, "Commit twelve", rev_id="b@u-0-8")
77
commit(self.br2, "Commit thirtteen", rev_id="b@u-0-9")
78
self.br1.add_pending_merge(self.br2.revision_history()[6])
79
commit(self.br1, "Commit fourtten", rev_id="a@u-0-6")
80
self.br2.add_pending_merge(self.br1.revision_history()[6])
81
commit(self.br2, "Commit fifteen", rev_id="b@u-0-10")
83
from bzrlib.revision import MultipleRevisionSources
84
self.sources = MultipleRevisionSources(self.br1, self.br2)
86
def intervene(self, ancestor, revision, revision_history=None):
87
from bzrlib.revision import get_intervening_revisions
88
return get_intervening_revisions(ancestor,revision, self.sources,
91
def test_intervene(self):
92
"""Find intermediate revisions, without requiring history"""
93
from bzrlib.errors import NotAncestor, NoSuchRevision
94
assert len(self.intervene('a@u-0-0', 'a@u-0-0')) == 0
95
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
96
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'),
97
['a@u-0-1', 'a@u-0-2'])
98
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'),
99
['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
100
self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'),
101
['b@u-0-4', 'a@u-0-3'])
102
self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3',
103
self.br1.revision_history()),
105
self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5',
106
self.br1.revision_history()),
107
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
109
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6',
110
self.br1.revision_history()),
111
['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
113
self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'),
114
['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
116
self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6',
117
self.br2.revision_history()),
118
['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
119
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'),
120
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
121
self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10',
122
self.br2.revision_history()),
123
['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
124
self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6',
125
self.br2.revision_history())
126
self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10',
127
'b@u-0-6', self.br2.revision_history())
128
self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10',
129
'c@u-0-6', self.br2.revision_history())
132
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):
133
164
"""Test checking whether a revision is an ancestor of another revision"""
135
def test_common_ancestor(self):
136
from bzrlib.revision import find_present_ancestors, common_ancestor
137
from bzrlib.revision import MultipleRevisionSources
138
br1, br2 = make_branches()
139
revisions = br1.revision_history()
140
revisions_2 = br2.revision_history()
141
sources = MultipleRevisionSources(br1, br2)
143
expected_ancestors_list = {revisions[3]:(0, 0),
145
revisions_2[4]:(2, 1),
147
revisions_2[3]:(4, 2),
148
revisions[0]:(5, 3) }
149
ancestors_list = find_present_ancestors(revisions[3], sources)
150
assert len(expected_ancestors_list) == len(ancestors_list)
151
for key, value in expected_ancestors_list.iteritems():
152
self.assertEqual(ancestors_list[key], value,
153
"key %r, %r != %r" % (key, ancestors_list[key],
156
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
158
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
160
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
162
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
164
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
166
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
168
self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
170
self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
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())
added
removed
bzrlib/tests/test_revision.py
