/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: Breezy landing bot
  • Author(s): Colin Watson
  • Date: 2020-11-16 21:47:08 UTC
  • mfrom: (7521.1.1 remove-lp-workaround)
  • Revision ID: breezy.the.bot@gmail.com-20201116214708-jos209mgxi41oy15
Remove breezy.git workaround for bazaar.launchpad.net.

Merged from https://code.launchpad.net/~cjwatson/brz/remove-lp-workaround/+merge/393710

Show diffs side-by-side

added added

removed removed

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