/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_missing.py

  • Committer: Jelmer Vernooij
  • Date: 2020-03-22 01:35:14 UTC
  • mfrom: (7490.7.6 work)
  • mto: This revision was merged to the branch mainline in revision 7499.
  • Revision ID: jelmer@jelmer.uk-20200322013514-7vw1ntwho04rcuj3
merge lp:brz/3.1.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_missing.py
40
40
        merger_tree = self.make_branch_and_tree('merger')
41
41
        merger = merger_tree.branch
42
42
        self.assertUnmerged(([], []), original, puller)
43
 
        original_tree.commit('a', rev_id='a')
44
 
        self.assertUnmerged(([('1', 'a', 0)], []), original, puller)
 
43
        original_tree.commit('a', rev_id=b'a')
 
44
        self.assertUnmerged(([('1', b'a', 0)], []), original, puller)
45
45
        puller_tree.pull(original)
46
46
        self.assertUnmerged(([], []), original, puller)
47
47
        merger_tree.pull(original)
48
 
        original_tree.commit('b', rev_id='b')
49
 
        original_tree.commit('c', rev_id='c')
50
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
48
        original_tree.commit('b', rev_id=b'b')
 
49
        original_tree.commit('c', rev_id=b'c')
 
50
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
51
51
                            original, puller)
52
 
        self.assertUnmerged(([('3', 'c', 0), ('2', 'b', 0)], []),
 
52
        self.assertUnmerged(([('3', b'c', 0), ('2', b'b', 0)], []),
53
53
                            original, puller, backward=True)
54
54
 
55
55
        puller_tree.pull(original)
56
56
        self.assertUnmerged(([], []), original, puller)
57
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
57
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
58
58
                            original, merger)
59
59
        merger_tree.merge_from_branch(original)
60
 
        self.assertUnmerged(([('2', 'b', 0), ('3', 'c', 0)], []),
 
60
        self.assertUnmerged(([('2', b'b', 0), ('3', b'c', 0)], []),
61
61
                            original, merger)
62
 
        merger_tree.commit('d', rev_id='d')
63
 
        self.assertUnmerged(([], [('2', 'd', 0)]), original, merger)
 
62
        merger_tree.commit('d', rev_id=b'd')
 
63
        self.assertUnmerged(([], [('2', b'd', 0)]), original, merger)
64
64
 
65
65
    def test_iter_log_revisions(self):
66
66
        base_tree = self.make_branch_and_tree('base')
67
67
        self.build_tree(['base/a'])
68
 
        base_tree.add(['a'], ['a-id'])
69
 
        base_tree.commit('add a', rev_id='b-1')
 
68
        base_tree.add(['a'], [b'a-id'])
 
69
        base_tree.commit('add a', rev_id=b'b-1')
70
70
 
71
71
        child_tree = base_tree.controldir.sprout('child').open_workingtree()
72
72
 
73
73
        self.build_tree(['child/b'])
74
 
        child_tree.add(['b'], ['b-id'])
75
 
        child_tree.commit('adding b', rev_id='c-2')
 
74
        child_tree.add(['b'], [b'b-id'])
 
75
        child_tree.commit('adding b', rev_id=b'c-2')
76
76
 
77
77
        child_tree.remove(['a'])
78
 
        child_tree.commit('removing a', rev_id='c-3')
 
78
        child_tree.commit('removing a', rev_id=b'c-3')
79
79
 
80
 
        self.build_tree_contents([('child/b', 'new contents for b\n')])
81
 
        child_tree.commit('modifying b', rev_id='c-4')
 
80
        self.build_tree_contents([('child/b', b'new contents for b\n')])
 
81
        child_tree.commit('modifying b', rev_id=b'c-4')
82
82
 
83
83
        child_tree.rename_one('b', 'c')
84
 
        child_tree.commit('rename b=>c', rev_id='c-5')
 
84
        child_tree.commit('rename b=>c', rev_id=b'c-5')
85
85
 
86
86
        base_extra, child_extra = missing.find_unmerged(base_tree.branch,
87
87
                                                        child_tree.branch)
88
88
        results = list(iter_log_revisions(base_extra,
89
 
                            base_tree.branch.repository,
90
 
                            verbose=True))
 
89
                                          base_tree.branch.repository,
 
90
                                          verbose=True))
91
91
        self.assertEqual([], results)
92
92
 
93
93
        results = list(iter_log_revisions(child_extra,
94
 
                            child_tree.branch.repository,
95
 
                            verbose=True))
 
94
                                          child_tree.branch.repository,
 
95
                                          verbose=True))
96
96
        self.assertEqual(4, len(results))
97
97
 
98
98
        r0, r1, r2, r3 = results
99
99
 
100
 
        self.assertEqual([('2', 'c-2'), ('3', 'c-3'),
101
 
                          ('4', 'c-4'), ('5', 'c-5'),],
 
100
        self.assertEqual([('2', b'c-2'), ('3', b'c-3'),
 
101
                          ('4', b'c-4'), ('5', b'c-5'), ],
102
102
                         [(r.revno, r.rev.revision_id) for r in results])
103
103
 
104
104
        delta0 = r0.delta
105
105
        self.assertNotEqual(None, delta0)
106
 
        self.assertEqual([('b', 'b-id', 'file')], delta0.added)
 
106
        self.assertEqual([('b', 'file')], [(c.path[1], c.kind[1]) for c in delta0.added])
107
107
        self.assertEqual([], delta0.removed)
108
108
        self.assertEqual([], delta0.renamed)
 
109
        self.assertEqual([], delta0.copied)
109
110
        self.assertEqual([], delta0.modified)
110
111
 
111
112
        delta1 = r1.delta
112
113
        self.assertNotEqual(None, delta1)
113
114
        self.assertEqual([], delta1.added)
114
 
        self.assertEqual([('a', 'a-id', 'file')], delta1.removed)
 
115
        self.assertEqual([('a', 'file')], [(c.path[0], c.kind[0]) for c in delta1.removed])
115
116
        self.assertEqual([], delta1.renamed)
 
117
        self.assertEqual([], delta1.copied)
116
118
        self.assertEqual([], delta1.modified)
117
119
 
118
120
        delta2 = r2.delta
120
122
        self.assertEqual([], delta2.added)
121
123
        self.assertEqual([], delta2.removed)
122
124
        self.assertEqual([], delta2.renamed)
123
 
        self.assertEqual([('b', 'b-id', 'file', True, False)], delta2.modified)
 
125
        self.assertEqual([], delta2.copied)
 
126
        self.assertEqual(
 
127
            [('b', 'file', True, False)],
 
128
            [(c.path[1], c.kind[1], c.changed_content, c.meta_modified()) for c in delta2.modified])
124
129
 
125
130
        delta3 = r3.delta
126
131
        self.assertNotEqual(None, delta3)
127
132
        self.assertEqual([], delta3.added)
 
133
        self.assertEqual([], delta3.copied)
128
134
        self.assertEqual([], delta3.removed)
129
 
        self.assertEqual([('b', 'c', 'b-id', 'file', False, False)],
130
 
                         delta3.renamed)
 
135
        self.assertEqual(
 
136
            [('b', 'c', 'file', False, False)],
 
137
            [(c.path[0], c.path[1], c.kind[1], c.changed_content, c.meta_modified())
 
138
                for c in delta3.renamed])
131
139
        self.assertEqual([], delta3.modified)
132
140
 
133
141
 
134
142
class TestFindUnmerged(tests.TestCaseWithTransport):
135
143
 
136
144
    def assertUnmerged(self, local, remote, local_branch, remote_branch,
137
 
            restrict='all', include_merged=False, backward=False,
138
 
            local_revid_range=None, remote_revid_range=None):
 
145
                       restrict='all', include_merged=False, backward=False,
 
146
                       local_revid_range=None, remote_revid_range=None):
139
147
        """Check the output of find_unmerged_mainline_revisions"""
140
148
        local_extra, remote_extra = missing.find_unmerged(
141
149
            local_branch, remote_branch, restrict,
152
160
        self.addCleanup(tree.unlock)
153
161
        self.assertUnmerged([], [], tree.branch, tree.branch)
154
162
        self.assertUnmerged([], [], tree.branch, tree.branch,
155
 
            local_revid_range=(rev1, rev1))
 
163
                            local_revid_range=(rev1, rev1))
156
164
 
157
165
    def test_one_ahead(self):
158
166
        tree = self.make_branch_and_tree('tree')
159
 
        rev1 = tree.commit('one')
 
167
        tree.commit('one')
160
168
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
161
169
        rev2 = tree2.commit('two')
162
170
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
164
172
 
165
173
    def test_restrict(self):
166
174
        tree = self.make_branch_and_tree('tree')
167
 
        rev1 = tree.commit('one')
 
175
        tree.commit('one')
168
176
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
169
177
        rev2 = tree2.commit('two')
170
178
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
171
179
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
172
180
        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
173
 
                                               'remote')
 
181
                            'remote')
174
182
 
175
183
    def test_merged(self):
176
184
        tree = self.make_branch_and_tree('tree')
177
185
        rev1 = tree.commit('one')
178
186
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
179
 
        rev2 = tree2.commit('two')
180
 
        rev3 = tree2.commit('three')
 
187
        tree2.commit('two')
 
188
        tree2.commit('three')
181
189
        tree.merge_from_branch(tree2.branch)
182
190
        rev4 = tree.commit('four')
183
191
 
184
192
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
185
193
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
186
 
            local_revid_range=(rev4, rev4))
 
194
                            local_revid_range=(rev4, rev4))
187
195
        self.assertUnmerged([], [], tree.branch, tree2.branch,
188
 
            local_revid_range=(rev1, rev1))
 
196
                            local_revid_range=(rev1, rev1))
189
197
 
190
198
    def test_include_merged(self):
191
199
        tree = self.make_branch_and_tree('tree')
192
 
        rev1 = tree.commit('one', rev_id='rev1')
 
200
        tree.commit('one', rev_id=b'rev1')
193
201
 
194
202
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
195
 
        rev2 = tree2.commit('two', rev_id='rev2')
196
 
        rev3 = tree2.commit('three', rev_id='rev3')
 
203
        tree2.commit('two', rev_id=b'rev2')
 
204
        rev3 = tree2.commit('three', rev_id=b'rev3')
197
205
 
198
206
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
199
 
        rev4 = tree3.commit('four', rev_id='rev4')
200
 
        rev5 = tree3.commit('five', rev_id='rev5')
 
207
        rev4 = tree3.commit('four', rev_id=b'rev4')
 
208
        rev5 = tree3.commit('five', rev_id=b'rev5')
201
209
 
202
210
        tree2.merge_from_branch(tree3.branch)
203
 
        rev6 = tree2.commit('six', rev_id='rev6')
 
211
        rev6 = tree2.commit('six', rev_id=b'rev6')
204
212
 
205
 
        self.assertUnmerged([], [('2', 'rev2', 0), ('3', 'rev3', 0),
206
 
                                 ('4', 'rev6', 0),
207
 
                                 ('3.1.1', 'rev4', 1), ('3.1.2', 'rev5', 1),
 
213
        self.assertUnmerged([], [('2', b'rev2', 0), ('3', b'rev3', 0),
 
214
                                 ('4', b'rev6', 0),
 
215
                                 ('3.1.1', b'rev4', 1), ('3.1.2', b'rev5', 1),
208
216
                                 ],
209
217
                            tree.branch, tree2.branch,
210
218
                            include_merged=True)
211
219
 
212
 
        self.assertUnmerged([], [('4', 'rev6', 0),
213
 
                                 ('3.1.2', 'rev5', 1), ('3.1.1', 'rev4', 1),
214
 
                                 ('3', 'rev3', 0), ('2', 'rev2', 0),
 
220
        self.assertUnmerged([], [('4', b'rev6', 0),
 
221
                                 ('3.1.2', b'rev5', 1), ('3.1.1', b'rev4', 1),
 
222
                                 ('3', b'rev3', 0), ('2', b'rev2', 0),
215
223
                                 ],
216
224
                            tree.branch, tree2.branch,
217
225
                            include_merged=True,
218
226
                            backward=True)
219
227
 
220
 
        self.assertUnmerged([], [('4', 'rev6', 0)],
 
228
        self.assertUnmerged(
 
229
            [], [('4', b'rev6', 0)],
221
230
            tree.branch, tree2.branch,
222
231
            include_merged=True, remote_revid_range=(rev6, rev6))
223
232
 
224
 
        self.assertUnmerged([], [('3', 'rev3', 0), ('3.1.1', 'rev4', 1)],
225
 
                    tree.branch, tree2.branch,
226
 
                    include_merged=True, remote_revid_range=(rev3, rev4))
 
233
        self.assertUnmerged(
 
234
            [], [('3', b'rev3', 0), ('3.1.1', b'rev4', 1)],
 
235
            tree.branch, tree2.branch,
 
236
            include_merged=True, remote_revid_range=(rev3, rev4))
227
237
 
228
 
        self.assertUnmerged([], [('4', 'rev6', 0), ('3.1.2', 'rev5', 1)],
229
 
                    tree.branch, tree2.branch,
230
 
                    include_merged=True, remote_revid_range=(rev5, rev6))
 
238
        self.assertUnmerged(
 
239
            [], [('4', b'rev6', 0), ('3.1.2', b'rev5', 1)],
 
240
            tree.branch, tree2.branch,
 
241
            include_merged=True, remote_revid_range=(rev5, rev6))
231
242
 
232
243
    def test_revision_range(self):
233
244
        local = self.make_branch_and_tree('local')
240
251
        lrevid3 = local.commit('three')
241
252
        lrevid4 = local.commit('four')
242
253
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
243
 
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
 
254
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0),
 
255
                        ('4', rrevid4, 0)]
244
256
 
245
257
        # control
246
258
        self.assertUnmerged(local_extra, remote_extra,
247
 
            local.branch, remote.branch)
 
259
                            local.branch, remote.branch)
248
260
        self.assertUnmerged(local_extra, remote_extra,
249
 
            local.branch, remote.branch, local_revid_range=(None, None),
250
 
            remote_revid_range=(None, None))
 
261
                            local.branch, remote.branch, local_revid_range=(
 
262
                                None, None),
 
263
                            remote_revid_range=(None, None))
251
264
 
252
265
        # exclude local revisions
253
 
        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
 
266
        self.assertUnmerged(
 
267
            [('2', lrevid2, 0)], remote_extra,
254
268
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
255
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
 
269
        self.assertUnmerged(
 
270
            [('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
256
271
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
257
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
 
272
        self.assertUnmerged(
 
273
            [('2', lrevid2, 0), ('3', lrevid3, 0)], None,
258
274
            local.branch, remote.branch, 'local',
259
275
            local_revid_range=(lrevid2, lrevid3))
260
276
 
261
277
        # exclude remote revisions
262
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
278
        self.assertUnmerged(
 
279
            local_extra, [('2', rrevid2, 0)],
263
280
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
264
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
281
        self.assertUnmerged(
 
282
            local_extra, [('2', rrevid2, 0)],
265
283
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
266
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
284
        self.assertUnmerged(
 
285
            local_extra, [('2', rrevid2, 0)],
267
286
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
268
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
287
        self.assertUnmerged(
 
288
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
269
289
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
270
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
290
        self.assertUnmerged(
 
291
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
271
292
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
272
 
        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
 
293
        self.assertUnmerged(
 
294
            local_extra, [('3', rrevid3, 0)],
273
295
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
274
296
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
275
 
            local.branch, remote.branch, 'remote',
276
 
            remote_revid_range=(rrevid2, rrevid3))
 
297
                            local.branch, remote.branch, 'remote',
 
298
                            remote_revid_range=(rrevid2, rrevid3))
277
299
 
278
300
        # exclude local and remote revisions
279
301
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
280
 
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
281
 
            remote_revid_range=(rrevid3, rrevid3))
 
302
                            local.branch, remote.branch, local_revid_range=(
 
303
                                lrevid3, lrevid3),
 
304
                            remote_revid_range=(rrevid3, rrevid3))