← 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: 2008-09-26 22:14:42 UTC
  • mto: This revision was merged to the branch mainline in revision 3747.
  • Revision ID: john@arbash-meinel.com-20080926221442-3r67j99sr9rwe9w0
Make message optional, don't check the memory flag directly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
20
20
 
21
21
from bzrlib import (
22
22
    revision,
 
23
    symbol_versioning,
23
24
    )
24
25
from bzrlib.branch import Branch
25
26
from bzrlib.errors import NoSuchRevision
26
27
from bzrlib.deprecated_graph import Graph
27
 
from bzrlib.revision import (find_present_ancestors, combined_graph,
28
 
                             common_ancestor,
29
 
                             is_ancestor, MultipleRevisionSources,
 
28
from bzrlib.revision import (find_present_ancestors,
30
29
                             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):
 
42
def make_branches(self, format=None):
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")
 
61
    tree1 = self.make_branch_and_tree("branch1", format=format)
62
62
    br1 = tree1.branch
63
63
    
64
64
    tree1.commit("Commit one", rev_id="a@u-0-0")
124
124
                result = sorted(branch.repository.get_ancestry(rev_id))
125
125
                self.assertEquals(result, [None] + sorted(anc))
126
126
    
127
 
    
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()
133
 
        sources = br1
134
 
 
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))
146
 
 
147
127
 
148
128
class TestIntermediateRevisions(TestCaseWithTransport):
149
129
 
162
142
        wt2.merge_from_branch(self.br1)
163
143
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
164
144
 
165
 
        from bzrlib.revision import MultipleRevisionSources
166
 
        self.sources = MultipleRevisionSources(self.br1.repository,
167
 
                                               self.br2.repository)
168
 
 
169
 
 
170
145
 
171
146
class MockRevisionSource(object):
172
147
    """A RevisionSource that takes a pregenerated graph.
186
161
class TestCommonAncestor(TestCaseWithTransport):
187
162
    """Test checking whether a revision is an ancestor of another revision"""
188
163
 
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), 
196
 
                                   revisions[2]:(1, 1),
197
 
                                   revisions_2[4]:(2, 1), 
198
 
                                   revisions[1]:(3, 2),
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],
206
 
                                                    value))
207
 
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
208
 
                          revisions[0])
209
 
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
210
 
                          revisions[1])
211
 
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
212
 
                          revisions[1])
213
 
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
214
 
                          revisions[2])
215
 
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
216
 
                          revisions_2[4])
217
 
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
218
 
                          revisions_2[4])
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))
230
 
 
231
 
    def test_combined(self):
232
 
        """combined_graph
233
 
        Ensure it's not order-sensitive
234
 
        """
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)
245
 
 
246
164
    def test_get_history(self):
247
165
        # TODO: test ghosts on the left hand branch's impact
248
166
        # TODO: test ghosts on all parents, we should get some
262
180
        history = rev.get_history(tree.branch.repository)
263
181
        self.assertEqual([None, '1', '2' ,'3'], history)
264
182
 
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.
268
 
        graph = Graph()
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))
279
 
 
280
 
 
281
 
class TestMultipleRevisionSources(TestCaseWithTransport):
282
 
    """Tests for the MultipleRevisionSources adapter."""
283
 
 
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'],
297
 
                          'A':[]},
298
 
                         source.get_revision_graph('B'))
299
 
 
300
183
 
301
184
class TestReservedId(TestCase):
302
185
 
309
192
        self.assertEqual(False, revision.is_reserved_id(
310
193
            'arch:a@example.com/c--b--v--r'))
311
194
        self.assertEqual(False, revision.is_reserved_id(None))
 
195
 
 
196
 
 
197
class TestRevisionMethods(TestCase):
 
198
 
 
199
    def test_get_summary(self):
 
200
        r = revision.Revision('1')
 
201
        r.message = 'a'
 
202
        self.assertEqual('a', r.get_summary())
 
203
        r.message = 'a\nb'
 
204
        self.assertEqual('a', r.get_summary())
 
205
        r.message = '\na\nb'
 
206
        self.assertEqual('a', r.get_summary())
 
207
 
 
208
    def test_get_apparent_author(self):
 
209
        r = revision.Revision('1')
 
210
        r.committer = 'A'
 
211
        self.assertEqual('A', r.get_apparent_author())
 
212
        r.properties['author'] = 'B'
 
213
        self.assertEqual('B', r.get_apparent_author())