/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_revision.py

  • Committer: Robert Collins
  • Date: 2010-05-06 23:41:35 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506234135-yivbzczw1sejxnxc
Lock methods on ``Tree``, ``Branch`` and ``Repository`` are now
expected to return an object which can be used to unlock them. This reduces
duplicate code when using cleanups. The previous 'tokens's returned by
``Branch.lock_write`` and ``Repository.lock_write`` are now attributes
on the result of the lock_write. ``repository.RepositoryWriteLockResult``
and ``branch.BranchWriteLockResult`` document this. (Robert Collins)

``log._get_info_for_log_files`` now takes an add_cleanup callable.
(Robert Collins)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_revision.py
1
 
# Copyright (C) 2005-2011, 2016 Canonical Ltd
 
1
# Copyright (C) 2005 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
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
 
18
import os
18
19
import warnings
19
20
 
20
 
from breezy import (
 
21
from bzrlib import (
21
22
    bugtracker,
22
23
    revision,
23
 
    )
24
 
from breezy.revision import NULL_REVISION
25
 
from breezy.tests import TestCase, TestCaseWithTransport
26
 
from breezy.tests.matchers import MatchesAncestry
 
24
    symbol_versioning,
 
25
    )
 
26
from bzrlib.branch import Branch
 
27
from bzrlib.errors import (
 
28
    InvalidBugStatus,
 
29
    InvalidLineInBugsProperty,
 
30
    NoSuchRevision,
 
31
    )
 
32
from bzrlib.deprecated_graph import Graph
 
33
from bzrlib.revision import (find_present_ancestors,
 
34
                             NULL_REVISION)
 
35
from bzrlib.tests import TestCase, TestCaseWithTransport
 
36
from bzrlib.trace import mutter
 
37
from bzrlib.workingtree import WorkingTree
27
38
 
28
39
# We're allowed to test deprecated interfaces
29
40
warnings.filterwarnings('ignore',
30
 
                        '.*get_intervening_revisions was deprecated',
31
 
                        DeprecationWarning,
32
 
                        r'breezy\.tests\.test_revision')
 
41
        '.*get_intervening_revisions was deprecated',
 
42
        DeprecationWarning,
 
43
        r'bzrlib\.tests\.test_revision')
33
44
 
34
45
# XXX: Make this a method of a merge base case
35
 
 
36
 
 
37
46
def make_branches(self, format=None):
38
47
    """Create two branches
39
48
 
56
65
    tree1 = self.make_branch_and_tree("branch1", format=format)
57
66
    br1 = tree1.branch
58
67
 
59
 
    tree1.commit("Commit one", rev_id=b"a@u-0-0")
60
 
    tree1.commit("Commit two", rev_id=b"a@u-0-1")
61
 
    tree1.commit("Commit three", rev_id=b"a@u-0-2")
 
68
    tree1.commit("Commit one", rev_id="a@u-0-0")
 
69
    tree1.commit("Commit two", rev_id="a@u-0-1")
 
70
    tree1.commit("Commit three", rev_id="a@u-0-2")
62
71
 
63
 
    tree2 = tree1.controldir.sprout("branch2").open_workingtree()
 
72
    tree2 = tree1.bzrdir.sprout("branch2").open_workingtree()
64
73
    br2 = tree2.branch
65
 
    tree2.commit("Commit four", rev_id=b"b@u-0-3")
66
 
    tree2.commit("Commit five", rev_id=b"b@u-0-4")
67
 
    self.assertEqual(br2.last_revision(), b'b@u-0-4')
68
 
 
69
 
    tree1.merge_from_branch(br2)
70
 
    tree1.commit("Commit six", rev_id=b"a@u-0-3")
71
 
    tree1.commit("Commit seven", rev_id=b"a@u-0-4")
72
 
    tree2.commit("Commit eight", rev_id=b"b@u-0-5")
73
 
    self.assertEqual(br2.last_revision(), b'b@u-0-5')
74
 
 
75
 
    tree1.merge_from_branch(br2)
76
 
    tree1.commit("Commit nine", rev_id=b"a@u-0-5")
 
74
    tree2.commit("Commit four", rev_id="b@u-0-3")
 
75
    tree2.commit("Commit five", rev_id="b@u-0-4")
 
76
    revisions_2 = br2.revision_history()
 
77
    self.assertEquals(revisions_2[-1], 'b@u-0-4')
 
78
 
 
79
    tree1.merge_from_branch(br2)
 
80
    tree1.commit("Commit six", rev_id="a@u-0-3")
 
81
    tree1.commit("Commit seven", rev_id="a@u-0-4")
 
82
    tree2.commit("Commit eight", rev_id="b@u-0-5")
 
83
    self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
 
84
 
 
85
    tree1.merge_from_branch(br2)
 
86
    tree1.commit("Commit nine", rev_id="a@u-0-5")
77
87
    # DO NOT MERGE HERE - we WANT a GHOST.
78
 
    br1.lock_read()
79
 
    try:
80
 
        graph = br1.repository.get_graph()
81
 
        revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
82
 
                                                       [revision.NULL_REVISION]))
83
 
        revhistory.reverse()
84
 
    finally:
85
 
        br1.unlock()
86
 
    tree2.add_parent_tree_id(revhistory[4])
87
 
    tree2.commit("Commit ten - ghost merge", rev_id=b"b@u-0-6")
 
88
    tree2.add_parent_tree_id(br1.revision_history()[4])
 
89
    tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")
88
90
 
89
91
    return br1, br2
90
92
 
94
96
    def test_recorded_ancestry(self):
95
97
        """Test that commit records all ancestors"""
96
98
        br1, br2 = make_branches(self)
97
 
        d = [(b'a@u-0-0', [b'a@u-0-0']),
98
 
             (b'a@u-0-1', [b'a@u-0-0', b'a@u-0-1']),
99
 
             (b'a@u-0-2', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2']),
100
 
             (b'b@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3']),
101
 
             (b'b@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3',
102
 
                           b'b@u-0-4']),
103
 
             (b'a@u-0-3', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
104
 
                           b'a@u-0-3']),
105
 
             (b'a@u-0-4', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
106
 
                           b'a@u-0-3', b'a@u-0-4']),
107
 
             (b'b@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'b@u-0-3', b'b@u-0-4',
108
 
                           b'b@u-0-5']),
109
 
             (b'a@u-0-5', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-3', b'a@u-0-4',
110
 
                           b'b@u-0-3', b'b@u-0-4',
111
 
                           b'b@u-0-5', b'a@u-0-5']),
112
 
             (b'b@u-0-6', [b'a@u-0-0', b'a@u-0-1', b'a@u-0-2', b'a@u-0-4',
113
 
                           b'b@u-0-3', b'b@u-0-4',
114
 
                           b'b@u-0-5', b'b@u-0-6']),
 
99
        d = [('a@u-0-0', ['a@u-0-0']),
 
100
             ('a@u-0-1', ['a@u-0-0', 'a@u-0-1']),
 
101
             ('a@u-0-2', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2']),
 
102
             ('b@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3']),
 
103
             ('b@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3',
 
104
                          'b@u-0-4']),
 
105
             ('a@u-0-3', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
106
                          'a@u-0-3']),
 
107
             ('a@u-0-4', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
108
                          'a@u-0-3', 'a@u-0-4']),
 
109
             ('b@u-0-5', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2', 'b@u-0-3', 'b@u-0-4',
 
110
                          'b@u-0-5']),
 
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',
 
112
                          'b@u-0-3', 'b@u-0-4',
 
113
                          'b@u-0-5', 'a@u-0-5']),
 
114
             ('b@u-0-6', ['a@u-0-0', 'a@u-0-1', 'a@u-0-2',
 
115
                          'b@u-0-3', 'b@u-0-4',
 
116
                          'b@u-0-5', 'b@u-0-6']),
115
117
             ]
116
 
        br1_only = (b'a@u-0-3', b'a@u-0-4', b'a@u-0-5')
117
 
        br2_only = (b'b@u-0-6',)
 
118
        br1_only = ('a@u-0-3', 'a@u-0-4', 'a@u-0-5')
 
119
        br2_only = ('b@u-0-6',)
118
120
        for branch in br1, br2:
119
121
            for rev_id, anc in d:
120
 
                if rev_id in br1_only and branch is not br1:
121
 
                    continue
122
 
                if rev_id in br2_only and branch is not br2:
123
 
                    continue
124
 
                self.assertThat(anc,
125
 
                                MatchesAncestry(branch.repository, rev_id))
 
122
                if rev_id in br1_only and not branch is br1:
 
123
                    continue
 
124
                if rev_id in br2_only and not branch is br2:
 
125
                    continue
 
126
                mutter('ancestry of {%s}: %r',
 
127
                       rev_id, branch.repository.get_ancestry(rev_id))
 
128
                result = sorted(branch.repository.get_ancestry(rev_id))
 
129
                self.assertEquals(result, [None] + sorted(anc))
126
130
 
127
131
 
128
132
class TestIntermediateRevisions(TestCaseWithTransport):
130
134
    def setUp(self):
131
135
        TestCaseWithTransport.setUp(self)
132
136
        self.br1, self.br2 = make_branches(self)
133
 
        wt1 = self.br1.controldir.open_workingtree()
134
 
        wt2 = self.br2.controldir.open_workingtree()
135
 
        wt2.commit("Commit eleven", rev_id=b"b@u-0-7")
136
 
        wt2.commit("Commit twelve", rev_id=b"b@u-0-8")
137
 
        wt2.commit("Commit thirtteen", rev_id=b"b@u-0-9")
 
137
        wt1 = self.br1.bzrdir.open_workingtree()
 
138
        wt2 = self.br2.bzrdir.open_workingtree()
 
139
        wt2.commit("Commit eleven", rev_id="b@u-0-7")
 
140
        wt2.commit("Commit twelve", rev_id="b@u-0-8")
 
141
        wt2.commit("Commit thirtteen", rev_id="b@u-0-9")
138
142
 
139
143
        wt1.merge_from_branch(self.br2)
140
 
        wt1.commit("Commit fourtten", rev_id=b"a@u-0-6")
 
144
        wt1.commit("Commit fourtten", rev_id="a@u-0-6")
141
145
 
142
146
        wt2.merge_from_branch(self.br1)
143
 
        wt2.commit("Commit fifteen", rev_id=b"b@u-0-10")
 
147
        wt2.commit("Commit fifteen", rev_id="b@u-0-10")
144
148
 
145
149
 
146
150
class MockRevisionSource(object):
167
171
        # indicator. i.e. NULL_REVISION
168
172
        # RBC 20060608
169
173
        tree = self.make_branch_and_tree('.')
170
 
        tree.commit('1', rev_id=b'1', allow_pointless=True)
171
 
        tree.commit('2', rev_id=b'2', allow_pointless=True)
172
 
        tree.commit('3', rev_id=b'3', allow_pointless=True)
173
 
        rev = tree.branch.repository.get_revision(b'1')
174
 
        history = rev.get_history(tree.branch.repository)
175
 
        self.assertEqual([None, b'1'], history)
176
 
        rev = tree.branch.repository.get_revision(b'2')
177
 
        history = rev.get_history(tree.branch.repository)
178
 
        self.assertEqual([None, b'1', b'2'], history)
179
 
        rev = tree.branch.repository.get_revision(b'3')
180
 
        history = rev.get_history(tree.branch.repository)
181
 
        self.assertEqual([None, b'1', b'2', b'3'], history)
 
174
        tree.commit('1', rev_id = '1', allow_pointless=True)
 
175
        tree.commit('2', rev_id = '2', allow_pointless=True)
 
176
        tree.commit('3', rev_id = '3', allow_pointless=True)
 
177
        rev = tree.branch.repository.get_revision('1')
 
178
        history = rev.get_history(tree.branch.repository)
 
179
        self.assertEqual([None, '1'], history)
 
180
        rev = tree.branch.repository.get_revision('2')
 
181
        history = rev.get_history(tree.branch.repository)
 
182
        self.assertEqual([None, '1', '2'], history)
 
183
        rev = tree.branch.repository.get_revision('3')
 
184
        history = rev.get_history(tree.branch.repository)
 
185
        self.assertEqual([None, '1', '2' ,'3'], history)
182
186
 
183
187
 
184
188
class TestReservedId(TestCase):
187
191
        self.assertEqual(True, revision.is_reserved_id(NULL_REVISION))
188
192
        self.assertEqual(True, revision.is_reserved_id(
189
193
            revision.CURRENT_REVISION))
190
 
        self.assertEqual(True, revision.is_reserved_id(b'arch:'))
191
 
        self.assertEqual(False, revision.is_reserved_id(b'null'))
 
194
        self.assertEqual(True, revision.is_reserved_id('arch:'))
 
195
        self.assertEqual(False, revision.is_reserved_id('null'))
192
196
        self.assertEqual(False, revision.is_reserved_id(
193
 
            b'arch:a@example.com/c--b--v--r'))
 
197
            'arch:a@example.com/c--b--v--r'))
194
198
        self.assertEqual(False, revision.is_reserved_id(None))
195
199
 
196
200
 
207
211
        r.message = None
208
212
        self.assertEqual('', r.get_summary())
209
213
 
 
214
    def test_get_apparent_author(self):
 
215
        r = revision.Revision('1')
 
216
        r.committer = 'A'
 
217
        author = self.applyDeprecated(
 
218
                symbol_versioning.deprecated_in((1, 13, 0)),
 
219
                r.get_apparent_author)
 
220
        self.assertEqual('A', author)
 
221
        r.properties['author'] = 'B'
 
222
        author = self.applyDeprecated(
 
223
                symbol_versioning.deprecated_in((1, 13, 0)),
 
224
                r.get_apparent_author)
 
225
        self.assertEqual('B', author)
 
226
        r.properties['authors'] = 'C\nD'
 
227
        author = self.applyDeprecated(
 
228
                symbol_versioning.deprecated_in((1, 13, 0)),
 
229
                r.get_apparent_author)
 
230
        self.assertEqual('C', author)
 
231
 
 
232
    def test_get_apparent_author_none(self):
 
233
        r = revision.Revision('1')
 
234
        author = self.applyDeprecated(
 
235
                symbol_versioning.deprecated_in((1, 13, 0)),
 
236
                r.get_apparent_author)
 
237
        self.assertEqual(None, author)
 
238
 
210
239
    def test_get_apparent_authors(self):
211
240
        r = revision.Revision('1')
212
241
        r.committer = 'A'
213
242
        self.assertEqual(['A'], r.get_apparent_authors())
214
 
        r.properties[u'author'] = 'B'
 
243
        r.properties['author'] = 'B'
215
244
        self.assertEqual(['B'], r.get_apparent_authors())
216
 
        r.properties[u'authors'] = 'C\nD'
 
245
        r.properties['authors'] = 'C\nD'
217
246
        self.assertEqual(['C', 'D'], r.get_apparent_authors())
218
247
 
219
248
    def test_get_apparent_authors_no_committer(self):
231
260
    def test_some_bugs(self):
232
261
        r = revision.Revision(
233
262
            '1', properties={
234
 
                u'bugs': bugtracker.encode_fixes_bug_urls(
235
 
                    [('http://example.com/bugs/1', 'fixed'),
236
 
                     ('http://launchpad.net/bugs/1234', 'fixed')])})
 
263
                'bugs': bugtracker.encode_fixes_bug_urls(
 
264
                    ['http://example.com/bugs/1',
 
265
                     'http://launchpad.net/bugs/1234'])})
237
266
        self.assertEqual(
238
267
            [('http://example.com/bugs/1', bugtracker.FIXED),
239
268
             ('http://launchpad.net/bugs/1234', bugtracker.FIXED)],
241
270
 
242
271
    def test_no_status(self):
243
272
        r = revision.Revision(
244
 
            '1', properties={u'bugs': 'http://example.com/bugs/1'})
245
 
        self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
246
 
                          r.iter_bugs())
 
273
            '1', properties={'bugs': 'http://example.com/bugs/1'})
 
274
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
247
275
 
248
276
    def test_too_much_information(self):
249
277
        r = revision.Revision(
250
 
            '1', properties={u'bugs': 'http://example.com/bugs/1 fixed bar'})
251
 
        self.assertRaises(bugtracker.InvalidLineInBugsProperty, list,
252
 
                          r.iter_bugs())
 
278
            '1', properties={'bugs': 'http://example.com/bugs/1 fixed bar'})
 
279
        self.assertRaises(InvalidLineInBugsProperty, list, r.iter_bugs())
253
280
 
254
281
    def test_invalid_status(self):
255
282
        r = revision.Revision(
256
 
            '1', properties={u'bugs': 'http://example.com/bugs/1 faxed'})
257
 
        self.assertRaises(bugtracker.InvalidBugStatus, list, r.iter_bugs())
 
283
            '1', properties={'bugs': 'http://example.com/bugs/1 faxed'})
 
284
        self.assertRaises(InvalidBugStatus, list, r.iter_bugs())