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
21
20
from bzrlib import (
24
from bzrlib.branch import Branch
25
from bzrlib.errors import NoSuchRevision
26
from bzrlib.graph import Graph
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
29
is_ancestor, MultipleRevisionSources,
24
from bzrlib.errors import (
26
InvalidLineInBugsProperty,
28
from bzrlib.revision import NULL_REVISION
31
29
from bzrlib.tests import TestCase, TestCaseWithTransport
32
from bzrlib.trace import mutter
33
from bzrlib.workingtree import WorkingTree
30
from bzrlib.tests.matchers import MatchesAncestry
35
32
# We're allowed to test deprecated interfaces
36
33
warnings.filterwarnings('ignore',
58
55
so A is missing b6 at the start
59
56
and B is missing a3, a4, a5
61
tree1 = self.make_branch_and_tree("branch1")
58
tree1 = self.make_branch_and_tree("branch1", format=format)
64
61
tree1.commit("Commit one", rev_id="a@u-0-0")
65
62
tree1.commit("Commit two", rev_id="a@u-0-1")
66
63
tree1.commit("Commit three", rev_id="a@u-0-2")
68
tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
65
tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
70
67
tree2.commit("Commit four", rev_id="b@u-0-3")
71
68
tree2.commit("Commit five", rev_id="b@u-0-4")
72
revisions_2 = br2.revision_history()
73
self.assertEquals(revisions_2[-1], 'b@u-0-4')
69
self.assertEquals(br2.last_revision(), 'b@u-0-4')
75
71
tree1.merge_from_branch(br2)
76
72
tree1.commit("Commit six", rev_id="a@u-0-3")
77
73
tree1.commit("Commit seven", rev_id="a@u-0-4")
78
74
tree2.commit("Commit eight", rev_id="b@u-0-5")
79
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
75
self.assertEquals(br2.last_revision(), 'b@u-0-5')
81
77
tree1.merge_from_branch(br2)
82
78
tree1.commit("Commit nine", rev_id="a@u-0-5")
83
79
# DO NOT MERGE HERE - we WANT a GHOST.
84
tree2.add_parent_tree_id(br1.revision_history()[4])
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])
85
89
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
120
124
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
def test_is_ancestor(self):
129
"""Test checking whether a revision is an ancestor of another revision"""
130
br1, br2 = make_branches(self)
131
revisions = br1.revision_history()
132
revisions_2 = br2.revision_history()
135
self.assert_(is_ancestor(revisions[0], revisions[0], br1))
136
self.assert_(is_ancestor(revisions[1], revisions[0], sources))
137
self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
138
self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
139
# disabled mbp 20050914, doesn't seem to happen anymore
140
## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
141
## revisions[0], br1)
142
self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
143
self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
144
self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
145
## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
127
MatchesAncestry(branch.repository, rev_id))
148
130
class TestIntermediateRevisions(TestCaseWithTransport):
186
163
class TestCommonAncestor(TestCaseWithTransport):
187
164
"""Test checking whether a revision is an ancestor of another revision"""
189
def test_common_ancestor(self):
190
"""Pick a reasonable merge base"""
191
br1, br2 = make_branches(self)
192
revisions = br1.revision_history()
193
revisions_2 = br2.revision_history()
194
sources = MultipleRevisionSources(br1.repository, br2.repository)
195
expected_ancestors_list = {revisions[3]:(0, 0),
197
revisions_2[4]:(2, 1),
199
revisions_2[3]:(4, 2),
200
revisions[0]:(5, 3) }
201
ancestors_list = find_present_ancestors(revisions[3], sources)
202
self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
203
for key, value in expected_ancestors_list.iteritems():
204
self.assertEqual(ancestors_list[key], value,
205
"key %r, %r != %r" % (key, ancestors_list[key],
207
self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
209
self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
211
self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
213
self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
215
self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
217
self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
219
self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
220
(revisions[4], revisions_2[5]))
221
self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
222
(revisions[4], revisions_2[5]))
223
self.assertEqual(None, common_ancestor(None, revisions[5], sources))
224
self.assertEqual(NULL_REVISION,
225
common_ancestor(NULL_REVISION, NULL_REVISION, sources))
226
self.assertEqual(NULL_REVISION,
227
common_ancestor(revisions[0], NULL_REVISION, sources))
228
self.assertEqual(NULL_REVISION,
229
common_ancestor(NULL_REVISION, revisions[0], sources))
231
def test_combined(self):
233
Ensure it's not order-sensitive
235
br1, br2 = make_branches(self)
236
source = MultipleRevisionSources(br1.repository, br2.repository)
237
combined_1 = combined_graph(br1.last_revision(),
238
br2.last_revision(), source)
239
combined_2 = combined_graph(br2.last_revision(),
240
br1.last_revision(), source)
241
self.assertEquals(combined_1[1], combined_2[1])
242
self.assertEquals(combined_1[2], combined_2[2])
243
self.assertEquals(combined_1[3], combined_2[3])
244
self.assertEquals(combined_1, combined_2)
246
166
def test_get_history(self):
247
167
# TODO: test ghosts on the left hand branch's impact
248
168
# TODO: test ghosts on all parents, we should get some
262
182
history = rev.get_history(tree.branch.repository)
263
183
self.assertEqual([None, '1', '2' ,'3'], history)
265
def test_common_ancestor_rootless_graph(self):
266
# common_ancestor on a graph with no reachable roots - only
267
# ghosts - should still return a useful value.
269
# add a ghost node which would be a root if it wasn't a ghost.
270
graph.add_ghost('a_ghost')
271
# add a normal commit on top of that
272
graph.add_node('rev1', ['a_ghost'])
273
# add a left-branch revision
274
graph.add_node('left', ['rev1'])
275
# add a right-branch revision
276
graph.add_node('right', ['rev1'])
277
source = MockRevisionSource(graph)
278
self.assertEqual('rev1', common_ancestor('left', 'right', source))
281
class TestMultipleRevisionSources(TestCaseWithTransport):
282
"""Tests for the MultipleRevisionSources adapter."""
284
def test_get_revision_graph_merges_ghosts(self):
285
# when we ask for the revision graph for B, which
286
# is in repo 1 with a ghost of A, and which is not
287
# in repo 2, which has A, the revision_graph()
288
# should return A and B both.
289
tree_1 = self.make_branch_and_tree('1')
290
tree_1.set_parent_ids(['A'], allow_leftmost_as_ghost=True)
291
tree_1.commit('foo', rev_id='B', allow_pointless=True)
292
tree_2 = self.make_branch_and_tree('2')
293
tree_2.commit('bar', rev_id='A', allow_pointless=True)
294
source = MultipleRevisionSources(tree_1.branch.repository,
295
tree_2.branch.repository)
296
self.assertEqual({'B':['A'],
298
source.get_revision_graph('B'))
301
186
class TestReservedId(TestCase):
309
194
self.assertEqual(False, revision.is_reserved_id(
310
195
'arch:a@example.com/c--b--v--r'))
311
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())