← 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: Ian Clatworthy
  • Date: 2009-01-19 02:24:15 UTC
  • mto: This revision was merged to the branch mainline in revision 3944.
  • Revision ID: ian.clatworthy@canonical.com-20090119022415-mo0mcfeiexfktgwt
apply jam's log --short fix (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

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