← 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: 2013-05-19 14:29:37 UTC
  • mfrom: (6437.63.9 2.5)
  • mto: (6437.63.10 2.5)
  • mto: This revision was merged to the branch mainline in revision 6575.
  • Revision ID: john@arbash-meinel.com-20130519142937-21ykz2n2y2f22za9
Merge in the actual 2.5 branch. It seems I failed before

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2011 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
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
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
 
 
17
 
 
18
 
import os
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
 
19
18
import warnings
20
19
 
21
20
from bzrlib import (
 
21
    bugtracker,
22
22
    revision,
23
23
    )
24
 
from bzrlib.branch import Branch
25
 
from bzrlib.errors import NoSuchRevision
26
 
from bzrlib.graph import Graph
27
 
from bzrlib.revision import (find_present_ancestors, combined_graph,
28
 
                             common_ancestor,
29
 
                             is_ancestor, MultipleRevisionSources,
30
 
                             NULL_REVISION)
 
24
from bzrlib.errors import (
 
25
    InvalidBugStatus,
 
26
    InvalidLineInBugsProperty,
 
27
    )
 
28
from bzrlib.revision import NULL_REVISION
31
29
from bzrlib.tests import TestCase, TestCaseWithTransport
32
 
from bzrlib.trace import mutter
33
 
from bzrlib.workingtree import WorkingTree
 
30
from bzrlib.tests.matchers import MatchesAncestry
34
31
 
35
32
# We're allowed to test deprecated interfaces
36
33
warnings.filterwarnings('ignore',
39
36
        r'bzrlib\.tests\.test_revision')
40
37
 
41
38
# XXX: Make this a method of a merge base case
42
 
def make_branches(self):
 
39
def make_branches(self, format=None):
43
40
    """Create two branches
44
41
 
45
42
    branch 1 has 6 commits, branch 2 has 3 commits
47
44
 
48
45
    the object graph is
49
46
    B:     A:
50
 
    a..0   a..0 
 
47
    a..0   a..0
51
48
    a..1   a..1
52
49
    a..2   a..2
53
50
    b..3   a..3 merges b..4
58
55
    so A is missing b6 at the start
59
56
    and B is missing a3, a4, a5
60
57
    """
61
 
    tree1 = self.make_branch_and_tree("branch1")
 
58
    tree1 = self.make_branch_and_tree("branch1", format=format)
62
59
    br1 = tree1.branch
63
 
    
 
60
 
64
61
    tree1.commit("Commit one", rev_id="a@u-0-0")
65
62
    tree1.commit("Commit two", rev_id="a@u-0-1")
66
63
    tree1.commit("Commit three", rev_id="a@u-0-2")
67
64
 
68
 
    tree2 = tree1.bzrdir.clone("branch2").open_workingtree()
 
65
    tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
69
66
    br2 = tree2.branch
70
67
    tree2.commit("Commit four", rev_id="b@u-0-3")
71
68
    tree2.commit("Commit five", rev_id="b@u-0-4")
72
 
    revisions_2 = br2.revision_history()
73
 
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
74
 
    
 
69
    self.assertEquals(br2.last_revision(), 'b@u-0-4')
 
70
 
75
71
    tree1.merge_from_branch(br2)
76
72
    tree1.commit("Commit six", rev_id="a@u-0-3")
77
73
    tree1.commit("Commit seven", rev_id="a@u-0-4")
78
74
    tree2.commit("Commit eight", rev_id="b@u-0-5")
79
 
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
80
 
    
 
75
    self.assertEquals(br2.last_revision(), 'b@u-0-5')
 
76
 
81
77
    tree1.merge_from_branch(br2)
82
78
    tree1.commit("Commit nine", rev_id="a@u-0-5")
83
79
    # DO NOT MERGE HERE - we WANT a GHOST.
84
 
    tree2.add_parent_tree_id(br1.revision_history()[4])
 
80
    br1.lock_read()
 
81
    try:
 
82
        graph = br1.repository.get_graph()
 
83
        revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
 
84
            [revision.NULL_REVISION]))
 
85
        revhistory.reverse()
 
86
    finally:
 
87
        br1.unlock()
 
88
    tree2.add_parent_tree_id(revhistory[4])
85
89
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
86
 
    
 
90
 
87
91
    return br1, br2
88
92
 
89
93
 
107
111
             ('a@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-3', 'a@u-0-4',
108
112
                          'b@u-0-3', 'b@u-0-4',
109
113
                          'b@u-0-5', 'a@u-0-5']),
110
 
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
 
114
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'a@u-0-4',
111
115
                          'b@u-0-3', 'b@u-0-4',
112
116
                          'b@u-0-5', 'b@u-0-6']),
113
117
             ]
119
123
                    continue
120
124
                if rev_id in br2_only and not branch is br2:
121
125
                    continue
122
 
                mutter('ancestry of {%s}: %r',
123
 
                       rev_id, branch.repository.get_ancestry(rev_id))
124
 
                result = sorted(branch.repository.get_ancestry(rev_id))
125
 
                self.assertEquals(result, [None] + sorted(anc))
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))
 
126
                self.assertThat(anc,
 
127
                    MatchesAncestry(branch.repository, rev_id))
146
128
 
147
129
 
148
130
class TestIntermediateRevisions(TestCaseWithTransport):
162
144
        wt2.merge_from_branch(self.br1)
163
145
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
164
146
 
165
 
        from bzrlib.revision import MultipleRevisionSources
166
 
        self.sources = MultipleRevisionSources(self.br1.repository,
167
 
                                               self.br2.repository)
168
 
 
169
 
 
170
147
 
171
148
class MockRevisionSource(object):
172
149
    """A RevisionSource that takes a pregenerated graph.
186
163
class TestCommonAncestor(TestCaseWithTransport):
187
164
    """Test checking whether a revision is an ancestor of another revision"""
188
165
 
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
166
    def test_get_history(self):
247
167
        # TODO: test ghosts on the left hand branch's impact
248
168
        # TODO: test ghosts on all parents, we should get some
262
182
        history = rev.get_history(tree.branch.repository)
263
183
        self.assertEqual([None, '1', '2' ,'3'], history)
264
184
 
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
185
 
301
186
class TestReservedId(TestCase):
302
187
 
309
194
        self.assertEqual(False, revision.is_reserved_id(
310
195
            'arch:a@example.com/c--b--v--r'))
311
196
        self.assertEqual(False, revision.is_reserved_id(None))
 
197
 
 
198
 
 
199
class TestRevisionMethods(TestCase):
 
200
 
 
201
    def test_get_summary(self):
 
202
        r = revision.Revision('1')
 
203
        r.message = 'a'
 
204
        self.assertEqual('a', r.get_summary())
 
205
        r.message = 'a\nb'
 
206
        self.assertEqual('a', r.get_summary())
 
207
        r.message = '\na\nb'
 
208
        self.assertEqual('a', r.get_summary())
 
209
        r.message = None
 
210
        self.assertEqual('', r.get_summary())
 
211
 
 
212
    def test_get_apparent_authors(self):
 
213
        r = revision.Revision('1')
 
214
        r.committer = 'A'
 
215
        self.assertEqual(['A'], r.get_apparent_authors())
 
216
        r.properties['author'] = 'B'
 
217
        self.assertEqual(['B'], r.get_apparent_authors())
 
218
        r.properties['authors'] = 'C\nD'
 
219
        self.assertEqual(['C', 'D'], r.get_apparent_authors())
 
220
 
 
221
    def test_get_apparent_authors_no_committer(self):
 
222
        r = revision.Revision('1')
 
223
        self.assertEqual([], r.get_apparent_authors())
 
224
 
 
225
 
 
226
class TestRevisionBugs(TestCase):
 
227
    """Tests for getting the bugs that a revision is linked to."""
 
228
 
 
229
    def test_no_bugs(self):
 
230
        r = revision.Revision('1')
 
231
        self.assertEqual([], list(r.iter_bugs()))
 
232
 
 
233
    def test_some_bugs(self):
 
234
        r = revision.Revision(
 
235
            '1', properties={
 
236
                'bugs': bugtracker.encode_fixes_bug_urls(
 
237
                    ['http://example.com/bugs/1',
 
238
                     'http://launchpad.net/bugs/1234'])})
 
239
        self.assertEqual(
 
240
            [('http://example.com/bugs/1', bugtracker.FIXED),
 
241
             ('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
 
242
            list(r.iter_bugs()))
 
243
 
 
244
    def test_no_status(self):
 
245
        r = revision.Revision(
 
246
            '1', properties={'bugs': 'http://example.com/bugs/1'})
 
247
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
 
248
 
 
249
    def test_too_much_information(self):
 
250
        r = revision.Revision(
 
251
            '1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
 
252
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
 
253
 
 
254
    def test_invalid_status(self):
 
255
        r = revision.Revision(
 
256
            '1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
 
257
        self.assertRaises(InvalidBugStatus, list, r.iter_bugs())