← 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: Martin Pool
  • Date: 2006-05-12 06:59:47 UTC
  • mfrom: (1706 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1707.
  • Revision ID: mbp@sourcefrog.net-20060512065947-60e259ffea0bf4fb
[merge] bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005 Canonical Ltd
2
 
#
 
1
# (C) 2005 Canonical Ltd
 
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
5
5
# the Free Software Foundation; either version 2 of the License, or
6
6
# (at your option) any later version.
7
 
#
 
7
 
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.
12
 
#
 
12
 
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
16
16
 
17
17
 
18
18
import os
19
 
import warnings
20
19
 
21
 
from bzrlib import (
22
 
    revision,
23
 
    symbol_versioning,
24
 
    )
25
20
from bzrlib.branch import Branch
26
21
from bzrlib.errors import NoSuchRevision
27
 
from bzrlib.deprecated_graph import Graph
28
 
from bzrlib.revision import (find_present_ancestors,
29
 
                             NULL_REVISION)
30
 
from bzrlib.symbol_versioning import one_three
31
 
from bzrlib.tests import TestCase, TestCaseWithTransport
 
22
from bzrlib.commit import commit
 
23
from bzrlib.graph import Graph
 
24
from bzrlib.revision import (find_present_ancestors, combined_graph,
 
25
                             common_ancestor,
 
26
                             is_ancestor, MultipleRevisionSources)
 
27
from bzrlib.tests import TestCaseWithTransport
32
28
from bzrlib.trace import mutter
33
29
from bzrlib.workingtree import WorkingTree
34
30
 
35
 
# We're allowed to test deprecated interfaces
36
 
warnings.filterwarnings('ignore',
37
 
        '.*get_intervening_revisions was deprecated',
38
 
        DeprecationWarning,
39
 
        r'bzrlib\.tests\.test_revision')
40
 
 
41
31
# XXX: Make this a method of a merge base case
42
 
def make_branches(self, format=None):
 
32
def make_branches(self):
43
33
    """Create two branches
44
34
 
45
35
    branch 1 has 6 commits, branch 2 has 3 commits
58
48
    so A is missing b6 at the start
59
49
    and B is missing a3, a4, a5
60
50
    """
61
 
    tree1 = self.make_branch_and_tree("branch1", format=format)
 
51
    tree1 = self.make_branch_and_tree("branch1")
62
52
    br1 = tree1.branch
63
53
    
64
54
    tree1.commit("Commit one", rev_id="a@u-0-0")
70
60
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
61
    tree2.commit("Commit five", rev_id="b@u-0-4")
72
62
    revisions_2 = br2.revision_history()
73
 
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
63
    
75
 
    tree1.merge_from_branch(br2)
 
64
    br1.fetch(br2)
 
65
    tree1.add_pending_merge(revisions_2[4])
 
66
    self.assertEquals(revisions_2[4], 'b@u-0-4')
76
67
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
68
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
69
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
 
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
70
    
81
 
    tree1.merge_from_branch(br2)
 
71
    br1.fetch(br2)
 
72
    tree1.add_pending_merge(br2.revision_history()[5])
82
73
    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])
 
74
    # DO NOT FETCH HERE - we WANT a GHOST.
 
75
    # br2.fetch(br1)
 
76
    tree2.add_pending_merge(br1.revision_history()[4])
85
77
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
86
78
    
87
79
    return br1, br2
124
116
                result = sorted(branch.repository.get_ancestry(rev_id))
125
117
                self.assertEquals(result, [None] + sorted(anc))
126
118
    
 
119
    
 
120
    def test_is_ancestor(self):
 
121
        """Test checking whether a revision is an ancestor of another revision"""
 
122
        br1, br2 = make_branches(self)
 
123
        revisions = br1.revision_history()
 
124
        revisions_2 = br2.revision_history()
 
125
        sources = br1
 
126
 
 
127
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
 
128
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
 
129
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
 
130
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
 
131
        # disabled mbp 20050914, doesn't seem to happen anymore
 
132
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
133
        ##                  revisions[0], br1)        
 
134
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
 
135
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
 
136
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
137
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
 
138
 
127
139
 
128
140
class TestIntermediateRevisions(TestCaseWithTransport):
129
141
 
130
142
    def setUp(self):
 
143
        from bzrlib.commit import commit
131
144
        TestCaseWithTransport.setUp(self)
132
145
        self.br1, self.br2 = make_branches(self)
133
146
        wt1 = self.br1.bzrdir.open_workingtree()
136
149
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
137
150
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
138
151
 
139
 
        wt1.merge_from_branch(self.br2)
 
152
        self.br1.fetch(self.br2)
 
153
        wt1.add_pending_merge(self.br2.revision_history()[6])
140
154
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
141
155
 
142
 
        wt2.merge_from_branch(self.br1)
 
156
        self.br2.fetch(self.br1)
 
157
        wt2.add_pending_merge(self.br1.revision_history()[6])
143
158
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
159
 
 
160
        from bzrlib.revision import MultipleRevisionSources
 
161
        self.sources = MultipleRevisionSources(self.br1.repository,
 
162
                                               self.br2.repository)
 
163
 
 
164
 
145
165
 
146
166
class MockRevisionSource(object):
147
167
    """A RevisionSource that takes a pregenerated graph.
161
181
class TestCommonAncestor(TestCaseWithTransport):
162
182
    """Test checking whether a revision is an ancestor of another revision"""
163
183
 
 
184
    def test_common_ancestor(self):
 
185
        """Pick a reasonable merge base"""
 
186
        br1, br2 = make_branches(self)
 
187
        revisions = br1.revision_history()
 
188
        revisions_2 = br2.revision_history()
 
189
        sources = MultipleRevisionSources(br1.repository, br2.repository)
 
190
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
191
                                   revisions[2]:(1, 1),
 
192
                                   revisions_2[4]:(2, 1), 
 
193
                                   revisions[1]:(3, 2),
 
194
                                   revisions_2[3]:(4, 2),
 
195
                                   revisions[0]:(5, 3) }
 
196
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
197
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
 
198
        for key, value in expected_ancestors_list.iteritems():
 
199
            self.assertEqual(ancestors_list[key], value, 
 
200
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
201
                                                    value))
 
202
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
203
                          revisions[0])
 
204
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
205
                          revisions[1])
 
206
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
207
                          revisions[1])
 
208
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
209
                          revisions[2])
 
210
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
211
                          revisions_2[4])
 
212
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
213
                          revisions_2[4])
 
214
        self.assertTrue(common_ancestor(revisions[5], revisions_2[6], sources) in
 
215
                        (revisions[4], revisions_2[5]))
 
216
        self.assertTrue(common_ancestor(revisions_2[6], revisions[5], sources),
 
217
                        (revisions[4], revisions_2[5]))
 
218
        self.assertEqual(None, common_ancestor(None, revisions[5], sources))
 
219
 
 
220
    def test_combined(self):
 
221
        """combined_graph
 
222
        Ensure it's not order-sensitive
 
223
        """
 
224
        br1, br2 = make_branches(self)
 
225
        source = MultipleRevisionSources(br1.repository, br2.repository)
 
226
        combined_1 = combined_graph(br1.last_revision(), 
 
227
                                    br2.last_revision(), source)
 
228
        combined_2 = combined_graph(br2.last_revision(),
 
229
                                    br1.last_revision(), source)
 
230
        self.assertEquals(combined_1[1], combined_2[1])
 
231
        self.assertEquals(combined_1[2], combined_2[2])
 
232
        self.assertEquals(combined_1[3], combined_2[3])
 
233
        self.assertEquals(combined_1, combined_2)
 
234
 
164
235
    def test_get_history(self):
165
236
        # TODO: test ghosts on the left hand branch's impact
166
237
        # TODO: test ghosts on all parents, we should get some
180
251
        history = rev.get_history(tree.branch.repository)
181
252
        self.assertEqual([None, '1', '2' ,'3'], history)
182
253
 
183
 
 
184
 
class TestReservedId(TestCase):
185
 
 
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))
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())
 
254
    def test_common_ancestor_rootless_graph(self):
 
255
        # common_ancestor on a graph with no reachable roots - only
 
256
        # ghosts - should still return a useful value.
 
257
        graph = Graph()
 
258
        # add a ghost node which would be a root if it wasn't a ghost.
 
259
        graph.add_ghost('a_ghost')
 
260
        # add a normal commit on top of that
 
261
        graph.add_node('rev1', ['a_ghost'])
 
262
        # add a left-branch revision
 
263
        graph.add_node('left', ['rev1'])
 
264
        # add a right-branch revision
 
265
        graph.add_node('right', ['rev1'])
 
266
        source = MockRevisionSource(graph)
 
267
        self.assertEqual('rev1', common_ancestor('left', 'right', source))
 
268
 
 
269
 
 
270
class TestMultipleRevisionSources(TestCaseWithTransport):
 
271
    """Tests for the MultipleRevisionSources adapter."""
 
272
 
 
273
    def test_get_revision_graph_merges_ghosts(self):
 
274
        # when we ask for the revision graph for B, which
 
275
        # is in repo 1 with a ghost of A, and which is not
 
276
        # in repo 2, which has A, the revision_graph()
 
277
        # should return A and B both.
 
278
        tree_1 = self.make_branch_and_tree('1')
 
279
        tree_1.add_pending_merge('A')
 
280
        tree_1.commit('foo', rev_id='B', allow_pointless=True)
 
281
        tree_2 = self.make_branch_and_tree('2')
 
282
        tree_2.commit('bar', rev_id='A', allow_pointless=True)
 
283
        source = MultipleRevisionSources(tree_1.branch.repository,
 
284
                                         tree_2.branch.repository)
 
285
        self.assertEqual({'B':['A'],
 
286
                          'A':[]},
 
287
                         source.get_revision_graph('B'))