← 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-03-03 08:55:34 UTC
  • mto: This revision was merged to the branch mainline in revision 1593.
  • Revision ID: mbp@sourcefrog.net-20060303085534-d24a8118f4ce571a
Add some tests that format7 repo creates the right lock type

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.revision import (find_present_ancestors, combined_graph,
 
24
                             is_ancestor, MultipleRevisionSources)
 
25
from bzrlib.tests import TestCaseWithTransport
32
26
from bzrlib.trace import mutter
33
27
from bzrlib.workingtree import WorkingTree
34
28
 
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
29
# XXX: Make this a method of a merge base case
42
 
def make_branches(self, format=None):
 
30
def make_branches(self):
43
31
    """Create two branches
44
32
 
45
33
    branch 1 has 6 commits, branch 2 has 3 commits
46
 
    commit 10 is a ghosted merge merge from branch 1
 
34
    commit 10 was a psuedo merge from branch 1
 
35
    but has been disabled until ghost support is
 
36
    implemented.
47
37
 
48
38
    the object graph is
49
39
    B:     A:
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")
65
55
    tree1.commit("Commit two", rev_id="a@u-0-1")
66
56
    tree1.commit("Commit three", rev_id="a@u-0-2")
67
57
 
68
 
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
 
58
    tree2 = self.make_branch_and_tree("branch2")
69
59
    br2 = tree2.branch
 
60
    br2.update_revisions(br1)
70
61
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
62
    tree2.commit("Commit five", rev_id="b@u-0-4")
72
63
    revisions_2 = br2.revision_history()
73
 
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
64
    
75
 
    tree1.merge_from_branch(br2)
 
65
    br1.fetch(br2)
 
66
    tree1.add_pending_merge(revisions_2[4])
 
67
    self.assertEquals(revisions_2[4], 'b@u-0-4')
76
68
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
69
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
70
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
 
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
71
    
81
 
    tree1.merge_from_branch(br2)
 
72
    br1.fetch(br2)
 
73
    tree1.add_pending_merge(br2.revision_history()[5])
82
74
    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])
 
75
    # DO NOT FETCH HERE - we WANT a GHOST.
 
76
    # br2.fetch(br1)
 
77
    tree2.add_pending_merge(br1.revision_history()[4])
85
78
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
86
79
    
87
80
    return br1, br2
124
117
                result = sorted(branch.repository.get_ancestry(rev_id))
125
118
                self.assertEquals(result, [None] + sorted(anc))
126
119
    
 
120
    
 
121
    def test_is_ancestor(self):
 
122
        """Test checking whether a revision is an ancestor of another revision"""
 
123
        br1, br2 = make_branches(self)
 
124
        revisions = br1.revision_history()
 
125
        revisions_2 = br2.revision_history()
 
126
        sources = br1
 
127
 
 
128
        self.assert_(is_ancestor(revisions[0], revisions[0], br1))
 
129
        self.assert_(is_ancestor(revisions[1], revisions[0], sources))
 
130
        self.assert_(not is_ancestor(revisions[0], revisions[1], sources))
 
131
        self.assert_(is_ancestor(revisions_2[3], revisions[0], sources))
 
132
        # disabled mbp 20050914, doesn't seem to happen anymore
 
133
        ## self.assertRaises(NoSuchRevision, is_ancestor, revisions_2[3],
 
134
        ##                  revisions[0], br1)        
 
135
        self.assert_(is_ancestor(revisions[3], revisions_2[4], sources))
 
136
        self.assert_(is_ancestor(revisions[3], revisions_2[4], br1))
 
137
        self.assert_(is_ancestor(revisions[3], revisions_2[3], sources))
 
138
        ## self.assert_(not is_ancestor(revisions[3], revisions_2[3], br1))
 
139
 
127
140
 
128
141
class TestIntermediateRevisions(TestCaseWithTransport):
129
142
 
130
143
    def setUp(self):
 
144
        from bzrlib.commit import commit
131
145
        TestCaseWithTransport.setUp(self)
132
146
        self.br1, self.br2 = make_branches(self)
133
147
        wt1 = self.br1.bzrdir.open_workingtree()
136
150
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
137
151
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
138
152
 
139
 
        wt1.merge_from_branch(self.br2)
 
153
        self.br1.fetch(self.br2)
 
154
        wt1.add_pending_merge(self.br2.revision_history()[6])
140
155
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
141
156
 
142
 
        wt2.merge_from_branch(self.br1)
 
157
        self.br2.fetch(self.br1)
 
158
        wt2.add_pending_merge(self.br1.revision_history()[6])
143
159
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
160
 
145
 
 
146
 
class MockRevisionSource(object):
147
 
    """A RevisionSource that takes a pregenerated graph.
148
 
 
149
 
    This is useful for testing revision graph algorithms where
150
 
    the actual branch existing is irrelevant.
151
 
    """
152
 
 
153
 
    def __init__(self, full_graph):
154
 
        self._full_graph = full_graph
155
 
 
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
        from bzrlib.revision import MultipleRevisionSources
 
162
        self.sources = MultipleRevisionSources(self.br1.repository,
 
163
                                               self.br2.repository)
 
164
 
 
165
    def intervene(self, ancestor, revision, revision_history=None):
 
166
        from bzrlib.revision import get_intervening_revisions
 
167
        return get_intervening_revisions(ancestor,revision, self.sources, 
 
168
                                         revision_history)
 
169
 
 
170
    def test_intervene(self):
 
171
        """Find intermediate revisions, without requiring history"""
 
172
        from bzrlib.errors import NotAncestor, NoSuchRevision
 
173
        self.assertEquals(len(self.intervene('a@u-0-0', 'a@u-0-0')), 0)
 
174
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-1'), ['a@u-0-1'])
 
175
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-2'), 
 
176
                         ['a@u-0-1', 'a@u-0-2'])
 
177
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-3'), 
 
178
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3'])
 
179
        self.assertEqual(self.intervene('b@u-0-3', 'a@u-0-3'), 
 
180
                         ['b@u-0-4', 'a@u-0-3'])
 
181
        self.assertEqual(self.intervene('a@u-0-2', 'a@u-0-3', 
 
182
                                        self.br1.revision_history()), 
 
183
                         ['a@u-0-3'])
 
184
        self.assertEqual(self.intervene('a@u-0-0', 'a@u-0-5', 
 
185
                                        self.br1.revision_history()), 
 
186
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
187
                          'a@u-0-5'])
 
188
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-6', 
 
189
                         self.br1.revision_history()), 
 
190
                         ['a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4', 
 
191
                          'b@u-0-6'])
 
192
        self.assertEqual(self.intervene('a@u-0-0', 'b@u-0-5'), 
 
193
                         ['a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4', 
 
194
                          'b@u-0-5'])
 
195
        self.assertEqual(self.intervene('b@u-0-3', 'b@u-0-6', 
 
196
                         self.br2.revision_history()), 
 
197
                         ['b@u-0-4', 'b@u-0-5', 'b@u-0-6'])
 
198
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10'), 
 
199
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
200
        self.assertEqual(self.intervene('b@u-0-6', 'b@u-0-10', 
 
201
                                        self.br2.revision_history()), 
 
202
                         ['b@u-0-7', 'b@u-0-8', 'b@u-0-9', 'b@u-0-10'])
 
203
        self.assertRaises(NotAncestor, self.intervene, 'b@u-0-10', 'b@u-0-6', 
 
204
                          self.br2.revision_history())
 
205
        self.assertRaises(NoSuchRevision, self.intervene, 'c@u-0-10', 
 
206
                          'b@u-0-6', self.br2.revision_history())
 
207
        self.assertRaises(NoSuchRevision, self.intervene, 'b@u-0-10', 
 
208
                          'c@u-0-6', self.br2.revision_history())
159
209
 
160
210
 
161
211
class TestCommonAncestor(TestCaseWithTransport):
162
212
    """Test checking whether a revision is an ancestor of another revision"""
163
213
 
 
214
    def test_old_common_ancestor(self):
 
215
        """Pick a resonable merge base using the old functionality"""
 
216
        from bzrlib.revision import old_common_ancestor as common_ancestor
 
217
        br1, br2 = make_branches(self)
 
218
        revisions = br1.revision_history()
 
219
        revisions_2 = br2.revision_history()
 
220
        sources = br1.repository
 
221
 
 
222
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
223
                                   revisions[2]:(1, 1),
 
224
                                   revisions_2[4]:(2, 1), 
 
225
                                   revisions[1]:(3, 2),
 
226
                                   revisions_2[3]:(4, 2),
 
227
                                   revisions[0]:(5, 3) }
 
228
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
229
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
 
230
        for key, value in expected_ancestors_list.iteritems():
 
231
            self.assertEqual(ancestors_list[key], value, 
 
232
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
233
                                                    value))
 
234
 
 
235
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
236
                          revisions[0])
 
237
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
238
                          revisions[1])
 
239
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
240
                          revisions[1])
 
241
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
242
                          revisions[2])
 
243
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
244
                          revisions_2[4])
 
245
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
246
                          revisions_2[4])
 
247
        br1.fetch(br2)
 
248
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
249
                          revisions[4]) # revisions_2[5] is equally valid
 
250
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
251
                          revisions_2[5])
 
252
 
 
253
    def test_common_ancestor(self):
 
254
        """Pick a reasonable merge base"""
 
255
        from bzrlib.revision import common_ancestor
 
256
        br1, br2 = make_branches(self)
 
257
        revisions = br1.revision_history()
 
258
        revisions_2 = br2.revision_history()
 
259
        sources = MultipleRevisionSources(br1.repository, br2.repository)
 
260
        expected_ancestors_list = {revisions[3]:(0, 0), 
 
261
                                   revisions[2]:(1, 1),
 
262
                                   revisions_2[4]:(2, 1), 
 
263
                                   revisions[1]:(3, 2),
 
264
                                   revisions_2[3]:(4, 2),
 
265
                                   revisions[0]:(5, 3) }
 
266
        ancestors_list = find_present_ancestors(revisions[3], sources)
 
267
        self.assertEquals(len(expected_ancestors_list), len(ancestors_list))
 
268
        for key, value in expected_ancestors_list.iteritems():
 
269
            self.assertEqual(ancestors_list[key], value, 
 
270
                              "key %r, %r != %r" % (key, ancestors_list[key],
 
271
                                                    value))
 
272
        self.assertEqual(common_ancestor(revisions[0], revisions[0], sources),
 
273
                          revisions[0])
 
274
        self.assertEqual(common_ancestor(revisions[1], revisions[2], sources),
 
275
                          revisions[1])
 
276
        self.assertEqual(common_ancestor(revisions[1], revisions[1], sources),
 
277
                          revisions[1])
 
278
        self.assertEqual(common_ancestor(revisions[2], revisions_2[4], sources),
 
279
                          revisions[2])
 
280
        self.assertEqual(common_ancestor(revisions[3], revisions_2[4], sources),
 
281
                          revisions_2[4])
 
282
        self.assertEqual(common_ancestor(revisions[4], revisions_2[5], sources),
 
283
                          revisions_2[4])
 
284
        self.assertEqual(common_ancestor(revisions[5], revisions_2[6], sources),
 
285
                          revisions[4]) # revisions_2[5] is equally valid
 
286
        self.assertEqual(common_ancestor(revisions_2[6], revisions[5], sources),
 
287
                          revisions[4]) # revisions_2[5] is equally valid
 
288
 
 
289
    def test_combined(self):
 
290
        """combined_graph
 
291
        Ensure it's not order-sensitive
 
292
        """
 
293
        br1, br2 = make_branches(self)
 
294
        source = MultipleRevisionSources(br1.repository, br2.repository)
 
295
        combined_1 = combined_graph(br1.last_revision(), 
 
296
                                    br2.last_revision(), source)
 
297
        combined_2 = combined_graph(br2.last_revision(),
 
298
                                    br1.last_revision(), source)
 
299
        self.assertEquals(combined_1[1], combined_2[1])
 
300
        self.assertEquals(combined_1[2], combined_2[2])
 
301
        self.assertEquals(combined_1[3], combined_2[3])
 
302
        self.assertEquals(combined_1, combined_2)
 
303
 
164
304
    def test_get_history(self):
165
305
        # TODO: test ghosts on the left hand branch's impact
166
306
        # TODO: test ghosts on all parents, we should get some
179
319
        rev = tree.branch.repository.get_revision('3')
180
320
        history = rev.get_history(tree.branch.repository)
181
321
        self.assertEqual([None, '1', '2' ,'3'], history)
182
 
 
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())