/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 breezy/tests/test_revision.py

  • Committer: Jelmer Vernooij
  • Date: 2018-07-08 14:45:27 UTC
  • mto: This revision was merged to the branch mainline in revision 7036.
  • Revision ID: jelmer@jelmer.uk-20180708144527-codhlvdcdg9y0nji
Fix a bunch of merge tests.

Show diffs side-by-side

added added

removed removed

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