1
# Copyright (C) 2005 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
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
25
from bzrlib.branch import Branch
26
from bzrlib.errors import NoSuchRevision
27
from bzrlib.deprecated_graph import Graph
28
from bzrlib.revision import (find_present_ancestors,
30
from bzrlib.symbol_versioning import one_three
31
from bzrlib.tests import TestCase, TestCaseWithTransport
32
from bzrlib.trace import mutter
33
from bzrlib.workingtree import WorkingTree
35
# We're allowed to test deprecated interfaces
36
warnings.filterwarnings('ignore',
37
'.*get_intervening_revisions was deprecated',
39
r'bzrlib\.tests\.test_revision')
41
# XXX: Make this a method of a merge base case
42
def make_branches(self, format=None):
43
"""Create two branches
45
branch 1 has 6 commits, branch 2 has 3 commits
46
commit 10 is a ghosted merge merge from branch 1
58
so A is missing b6 at the start
59
and B is missing a3, a4, a5
61
tree1 = self.make_branch_and_tree("branch1", format=format)
64
tree1.commit("Commit one", rev_id="a@u-0-0")
65
tree1.commit("Commit two", rev_id="a@u-0-1")
66
tree1.commit("Commit three", rev_id="a@u-0-2")
68
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
70
tree2.commit("Commit four", rev_id="b@u-0-3")
71
tree2.commit("Commit five", rev_id="b@u-0-4")
17
from bzrlib.selftest import InTempDir
21
from bzrlib.branch import Branch
22
from bzrlib.commit import commit
25
br1 = Branch("branch1", init=True)
26
commit(br1, "Commit one")
27
commit(br1, "Commit two")
28
commit(br1, "Commit three")
31
br2 = Branch("branch2", init=True)
32
br2.update_revisions(br1)
33
commit(br2, "Commit four")
34
commit(br2, "Commit five")
72
35
revisions_2 = br2.revision_history()
73
self.assertEquals(revisions_2[-1], 'b@u-0-4')
75
tree1.merge_from_branch(br2)
76
tree1.commit("Commit six", rev_id="a@u-0-3")
77
tree1.commit("Commit seven", rev_id="a@u-0-4")
78
tree2.commit("Commit eight", rev_id="b@u-0-5")
79
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
81
tree1.merge_from_branch(br2)
82
tree1.commit("Commit nine", rev_id="a@u-0-5")
83
# DO NOT MERGE HERE - we WANT a GHOST.
84
tree2.add_parent_tree_id(br1.revision_history()[4])
85
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
36
br1.add_pending_merge(revisions_2[4])
37
commit(br1, "Commit six")
90
class TestIsAncestor(TestCaseWithTransport):
92
def test_recorded_ancestry(self):
93
"""Test that commit records all ancestors"""
94
br1, br2 = make_branches(self)
95
d = [('a@u-0-0', ['a@u-0-0']),
96
('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
97
('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
98
('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
99
('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
101
('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
103
('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
104
'a@u-0-3', 'a@u-0-4']),
105
('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
107
('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
108
'b@u-0-3', 'b@u-0-4',
109
'b@u-0-5', 'a@u-0-5']),
110
('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
111
'b@u-0-3', 'b@u-0-4',
112
'b@u-0-5', 'b@u-0-6']),
114
br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
115
br2_only = ('b@u-0-6',)
116
for branch in br1, br2:
117
for rev_id, anc in d:
118
if rev_id in br1_only and not branch is br1:
120
if rev_id in br2_only and not branch is br2:
122
mutter('ancestry of {%s}: %r',
123
rev_id, branch.repository.get_ancestry(rev_id))
124
result = sorted(branch.repository.get_ancestry(rev_id))
125
self.assertEquals(result, [None] + sorted(anc))
128
class TestIntermediateRevisions(TestCaseWithTransport):
131
TestCaseWithTransport.setUp(self)
132
self.br1, self.br2 = make_branches(self)
133
wt1 = self.br1.bzrdir.open_workingtree()
134
wt2 = self.br2.bzrdir.open_workingtree()
135
wt2.commit("Commit eleven", rev_id="b@u-0-7")
136
wt2.commit("Commit twelve", rev_id="b@u-0-8")
137
wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
139
wt1.merge_from_branch(self.br2)
140
wt1.commit("Commit fourtten", rev_id="a@u-0-6")
142
wt2.merge_from_branch(self.br1)
143
wt2.commit("Commit fifteen", rev_id="b@u-0-10")
146
class MockRevisionSource(object):
147
"""A RevisionSource that takes a pregenerated graph.
149
This is useful for testing revision graph algorithms where
150
the actual branch existing is irrelevant.
153
def __init__(self, full_graph):
154
self._full_graph = full_graph
156
def get_revision_graph_with_ghosts(self, revision_ids):
157
# This is mocked out to just return a constant graph.
158
return self._full_graph
161
class TestCommonAncestor(TestCaseWithTransport):
41
class TestIsAncestor(InTempDir):
162
42
"""Test checking whether a revision is an ancestor of another revision"""
164
def test_get_history(self):
165
# TODO: test ghosts on the left hand branch's impact
166
# TODO: test ghosts on all parents, we should get some
167
# indicator. i.e. NULL_REVISION
169
tree = self.make_branch_and_tree('.')
170
tree.commit('1', rev_id = '1', allow_pointless=True)
171
tree.commit('2', rev_id = '2', allow_pointless=True)
172
tree.commit('3', rev_id = '3', allow_pointless=True)
173
rev = tree.branch.repository.get_revision('1')
174
history = rev.get_history(tree.branch.repository)
175
self.assertEqual([None, '1'], history)
176
rev = tree.branch.repository.get_revision('2')
177
history = rev.get_history(tree.branch.repository)
178
self.assertEqual([None, '1', '2'], history)
179
rev = tree.branch.repository.get_revision('3')
180
history = rev.get_history(tree.branch.repository)
181
self.assertEqual([None, '1', '2' ,'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('arch:'))
191
self.assertEqual(False, revision.is_reserved_id('null'))
192
self.assertEqual(False, revision.is_reserved_id(
193
'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
def test_get_apparent_author(self):
209
r = revision.Revision('1')
211
self.assertEqual('A', r.get_apparent_author())
212
r.properties['author'] = 'B'
213
self.assertEqual('B', r.get_apparent_author())
44
from bzrlib.revision import is_ancestor, MultipleRevisionSources
45
from bzrlib.errors import NoSuchRevision
46
br1, br2 = make_branches()
47
revisions = br1.revision_history()
48
revisions_2 = br2.revision_history()
49
sources = MultipleRevisionSources(br1, br2)
51
assert is_ancestor(revisions[0], revisions[0], sources)
52
assert is_ancestor(revisions[1], revisions[0], sources)
53
assert not is_ancestor(revisions[0], revisions[1], sources)
54
assert is_ancestor(revisions_2[3], revisions[0], sources)
55
self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
57
assert is_ancestor(revisions[3], revisions_2[4], sources)
58
assert is_ancestor(revisions[3], revisions_2[4], br1)
59
assert is_ancestor(revisions[3], revisions_2[3], sources)
60
assert not is_ancestor(revisions[3], revisions_2[3], br1)
added
removed
bzrlib/selftest/testrevision.py
