/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: 2020-05-06 02:13:25 UTC
  • mfrom: (7490.7.21 work)
  • mto: This revision was merged to the branch mainline in revision 7501.
  • Revision ID: jelmer@jelmer.uk-20200506021325-awbmmqu1zyorz7sj
Merge 3.1 branch.

Show diffs side-by-side

added added

removed removed

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