← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: John Arbash Meinel
  • Date: 2006-08-23 22:18:16 UTC
  • mto: This revision was merged to the branch mainline in revision 1955.
  • Revision ID: john@arbash-meinel.com-20060823221816-832d30e909734e97
Rename test_aftp_transport to test_ftp_tranpsport

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# (C) 2005 Canonical Ltd
2
2
#
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
20
20
 
21
21
from bzrlib import (
22
22
    revision,
23
 
    symbol_versioning,
24
23
    )
25
24
from bzrlib.branch import Branch
26
25
from bzrlib.errors import NoSuchRevision
27
 
from bzrlib.deprecated_graph import Graph
28
 
from bzrlib.revision import (find_present_ancestors,
 
26
from bzrlib.graph import Graph
 
27
from bzrlib.revision import (find_present_ancestors, combined_graph,
 
28
                             common_ancestor,
 
29
                             is_ancestor, MultipleRevisionSources,
29
30
                             NULL_REVISION)
30
 
from bzrlib.symbol_versioning import one_three
31
31
from bzrlib.tests import TestCase, TestCaseWithTransport
32
32
from bzrlib.trace import mutter
33
33
from bzrlib.workingtree import WorkingTree
39
39
        r'bzrlib\.tests\.test_revision')
40
40
 
41
41
# XXX: Make this a method of a merge base case
42
 
def make_branches(self, format=None):
 
42
def make_branches(self):
43
43
    """Create two branches
44
44
 
45
45
    branch 1 has 6 commits, branch 2 has 3 commits
58
58
    so A is missing b6 at the start
59
59
    and B is missing a3, a4, a5
60
60
    """
61
 
    tree1 = self.make_branch_and_tree("branch1", format=format)
 
61
    tree1 = self.make_branch_and_tree("branch1")
62
62
    br1 = tree1.branch
63
63
    
64
64
    tree1.commit("Commit one", rev_id="a@u-0-0")
70
70
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
71
    tree2.commit("Commit five", rev_id="b@u-0-4")
72
72
    revisions_2 = br2.revision_history()
73
 
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
73
    
75
 
    tree1.merge_from_branch(br2)
 
74
    br1.fetch(br2)
 
75
    tree1.add_pending_merge(revisions_2[4])
 
76
    self.assertEquals(revisions_2[4], 'b@u-0-4')
76
77
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
78
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
79
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
 
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
80
    
81
 
    tree1.merge_from_branch(br2)
 
81
    br1.fetch(br2)
 
82
    tree1.add_pending_merge(br2.revision_history()[5])
82
83
    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])
 
84
    # DO NOT FETCH HERE - we WANT a GHOST.
 
85
    # br2.fetch(br1)
 
86
    tree2.add_pending_merge(br1.revision_history()[4])
85
87
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
86
88
    
87
89
    return br1, br2
124
126
                result = sorted(branch.repository.get_ancestry(rev_id))
125
127
                self.assertEquals(result, [None] + sorted(anc))
126
128
    
 
129
    
 
130
    def test_is_ancestor(self):
 
131
        """Test checking whether a revision is an ancestor of another revision"""
 
132
        br1, br2 = make_branches(self)
 
133
        revisions = br1.revision_history()
 
134
        revisions_2 = br2.revision_history()
 
135
        sources = br1
 
136
 
 
137
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
 
138
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
 
139
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
 
140
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
 
141
        # disabled mbp 20050914, doesn't seem to happen anymore
 
142
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
143
        ##                  revisions[0], br1)        
 
144
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
 
145
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
 
146
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
147
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
 
148
 
127
149
 
128
150
class TestIntermediateRevisions(TestCaseWithTransport):
129
151
 
136
158
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
137
159
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
138
160
 
139
 
        wt1.merge_from_branch(self.br2)
 
161
        self.br1.fetch(self.br2)
 
162
        wt1.add_pending_merge(self.br2.revision_history()[6])
140
163
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
141
164
 
142
 
        wt2.merge_from_branch(self.br1)
 
165
        self.br2.fetch(self.br1)
 
166
        wt2.add_pending_merge(self.br1.revision_history()[6])
143
167
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
168
 
145
169
        from bzrlib.revision import MultipleRevisionSources
146
 
        self.sources = self.applyDeprecated(one_three,
147
 
                        MultipleRevisionSources, self.br1.repository,
148
 
                                                 self.br2.repository)
 
170
        self.sources = MultipleRevisionSources(self.br1.repository,
 
171
                                               self.br2.repository)
149
172
 
150
173
 
151
174
 
167
190
class TestCommonAncestor(TestCaseWithTransport):
168
191
    """Test checking whether a revision is an ancestor of another revision"""
169
192
 
 
193
    def test_common_ancestor(self):
 
194
        """Pick a reasonable merge base"""
 
195
        br1, br2 = make_branches(self)
 
196
        revisions = br1.revision_history()
 
197
        revisions_2 = br2.revision_history()
 
198
        sources = MultipleRevisionSources(br1.repository, br2.repository)
 
199
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
200
                                   revisions[2]:(1, 1),
 
201
                                   revisions_2[4]:(2, 1), 
 
202
                                   revisions[1]:(3, 2),
 
203
                                   revisions_2[3]:(4, 2),
 
204
                                   revisions[0]:(5, 3) }
 
205
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
206
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
 
207
        for key, value in expected_ancestors_list.iteritems():
 
208
            self.assertEqual(ancestors_list[key], value, 
 
209
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
210
                                                    value))
 
211
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
212
                          revisions[0])
 
213
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
214
                          revisions[1])
 
215
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
216
                          revisions[1])
 
217
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
218
                          revisions[2])
 
219
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
220
                          revisions_2[4])
 
221
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
222
                          revisions_2[4])
 
223
        self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
 
224
                        (revisions[4], revisions_2[5]))
 
225
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
 
226
                        (revisions[4], revisions_2[5]))
 
227
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
 
228
        self.assertEqual(NULL_REVISION,
 
229
            common_ancestor(NULL_REVISION, NULL_REVISION, sources))
 
230
        self.assertEqual(NULL_REVISION,
 
231
            common_ancestor(revisions[0], NULL_REVISION, sources))
 
232
        self.assertEqual(NULL_REVISION,
 
233
            common_ancestor(NULL_REVISION, revisions[0], sources))
 
234
 
 
235
    def test_combined(self):
 
236
        """combined_graph
 
237
        Ensure it's not order-sensitive
 
238
        """
 
239
        br1, br2 = make_branches(self)
 
240
        source = MultipleRevisionSources(br1.repository, br2.repository)
 
241
        combined_1 = combined_graph(br1.last_revision(), 
 
242
                                    br2.last_revision(), source)
 
243
        combined_2 = combined_graph(br2.last_revision(),
 
244
                                    br1.last_revision(), source)
 
245
        self.assertEquals(combined_1[1], combined_2[1])
 
246
        self.assertEquals(combined_1[2], combined_2[2])
 
247
        self.assertEquals(combined_1[3], combined_2[3])
 
248
        self.assertEquals(combined_1, combined_2)
 
249
 
170
250
    def test_get_history(self):
171
251
        # TODO: test ghosts on the left hand branch's impact
172
252
        # TODO: test ghosts on all parents, we should get some
186
266
        history = rev.get_history(tree.branch.repository)
187
267
        self.assertEqual([None, '1', '2' ,'3'], history)
188
268
 
189
 
 
190
 
class TestReservedId(TestCase):
191
 
 
192
 
    def test_is_reserved_id(self):
193
 
        self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
194
 
        self.assertEqual(True, revision.is_reserved_id(
195
 
            revision.CURRENT_REVISION))
196
 
        self.assertEqual(True, revision.is_reserved_id('arch:'))
197
 
        self.assertEqual(False, revision.is_reserved_id('null'))
198
 
        self.assertEqual(False, revision.is_reserved_id(
199
 
            'arch:a@example.com/c--b--v--r'))
200
 
        self.assertEqual(False, revision.is_reserved_id(None))
201
 
 
202
 
 
203
 
class TestRevisionMethods(TestCase):
204
 
 
205
 
    def test_get_summary(self):
206
 
        r = revision.Revision('1')
207
 
        r.message = 'a'
208
 
        self.assertEqual('a', r.get_summary())
209
 
        r.message = 'a\nb'
210
 
        self.assertEqual('a', r.get_summary())
211
 
        r.message = '\na\nb'
212
 
        self.assertEqual('a', r.get_summary())
213
 
 
214
 
    def test_get_apparent_author(self):
215
 
        r = revision.Revision('1')
216
 
        r.committer = 'A'
217
 
        self.assertEqual('A', r.get_apparent_author())
218
 
        r.properties['author'] = 'B'
219
 
        self.assertEqual('B', r.get_apparent_author())
 
269
    def test_common_ancestor_rootless_graph(self):
 
270
        # common_ancestor on a graph with no reachable roots - only
 
271
        # ghosts - should still return a useful value.
 
272
        graph = Graph()
 
273
        # add a ghost node which would be a root if it wasn't a ghost.
 
274
        graph.add_ghost('a_ghost')
 
275
        # add a normal commit on top of that
 
276
        graph.add_node('rev1', ['a_ghost'])
 
277
        # add a left-branch revision
 
278
        graph.add_node('left', ['rev1'])
 
279
        # add a right-branch revision
 
280
        graph.add_node('right', ['rev1'])
 
281
        source = MockRevisionSource(graph)
 
282
        self.assertEqual('rev1', common_ancestor('left', 'right', source))
 
283
 
 
284
 
 
285
class TestMultipleRevisionSources(TestCaseWithTransport):
 
286
    """Tests for the MultipleRevisionSources adapter."""
 
287
 
 
288
    def test_get_revision_graph_merges_ghosts(self):
 
289
        # when we ask for the revision graph for B, which
 
290
        # is in repo 1 with a ghost of A, and which is not
 
291
        # in repo 2, which has A, the revision_graph()
 
292
        # should return A and B both.
 
293
        tree_1 = self.make_branch_and_tree('1')
 
294
        tree_1.add_pending_merge('A')
 
295
        tree_1.commit('foo', rev_id='B', allow_pointless=True)
 
296
        tree_2 = self.make_branch_and_tree('2')
 
297
        tree_2.commit('bar', rev_id='A', allow_pointless=True)
 
298
        source = MultipleRevisionSources(tree_1.branch.repository,
 
299
                                         tree_2.branch.repository)
 
300
        self.assertEqual({'B':['A'],
 
301
                          'A':[]},
 
302
                         source.get_revision_graph('B'))