/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: 2019-06-02 02:35:46 UTC
  • mfrom: (7309 work)
  • mto: This revision was merged to the branch mainline in revision 7319.
  • Revision ID: jelmer@jelmer.uk-20190602023546-lqco868tnv26d8ow
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_missing.py
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
100
        self.assertEqual([('2', b'c-2'), ('3', b'c-3'),
101
 
                          ('4', b'c-4'), ('5', b'c-5'),],
 
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
120
120
        self.assertEqual([], delta2.added)
121
121
        self.assertEqual([], delta2.removed)
122
122
        self.assertEqual([], delta2.renamed)
123
 
        self.assertEqual([('b', b'b-id', 'file', True, False)], delta2.modified)
 
123
        self.assertEqual(
 
124
            [('b', b'b-id', 'file', True, False)], delta2.modified)
124
125
 
125
126
        delta3 = r3.delta
126
127
        self.assertNotEqual(None, delta3)
134
135
class TestFindUnmerged(tests.TestCaseWithTransport):
135
136
 
136
137
    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):
 
138
                       restrict='all', include_merged=False, backward=False,
 
139
                       local_revid_range=None, remote_revid_range=None):
139
140
        """Check the output of find_unmerged_mainline_revisions"""
140
141
        local_extra, remote_extra = missing.find_unmerged(
141
142
            local_branch, remote_branch, restrict,
152
153
        self.addCleanup(tree.unlock)
153
154
        self.assertUnmerged([], [], tree.branch, tree.branch)
154
155
        self.assertUnmerged([], [], tree.branch, tree.branch,
155
 
            local_revid_range=(rev1, rev1))
 
156
                            local_revid_range=(rev1, rev1))
156
157
 
157
158
    def test_one_ahead(self):
158
159
        tree = self.make_branch_and_tree('tree')
159
 
        rev1 = tree.commit('one')
 
160
        tree.commit('one')
160
161
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
161
162
        rev2 = tree2.commit('two')
162
163
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
164
165
 
165
166
    def test_restrict(self):
166
167
        tree = self.make_branch_and_tree('tree')
167
 
        rev1 = tree.commit('one')
 
168
        tree.commit('one')
168
169
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
169
170
        rev2 = tree2.commit('two')
170
171
        self.assertUnmerged([], [('2', rev2, 0)], tree.branch, tree2.branch)
171
172
        self.assertUnmerged([], None, tree.branch, tree2.branch, 'local')
172
173
        self.assertUnmerged(None, [('2', rev2, 0)], tree.branch, tree2.branch,
173
 
                                               'remote')
 
174
                            'remote')
174
175
 
175
176
    def test_merged(self):
176
177
        tree = self.make_branch_and_tree('tree')
177
178
        rev1 = tree.commit('one')
178
179
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
179
 
        rev2 = tree2.commit('two')
180
 
        rev3 = tree2.commit('three')
 
180
        tree2.commit('two')
 
181
        tree2.commit('three')
181
182
        tree.merge_from_branch(tree2.branch)
182
183
        rev4 = tree.commit('four')
183
184
 
184
185
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch)
185
186
        self.assertUnmerged([('2', rev4, 0)], [], tree.branch, tree2.branch,
186
 
            local_revid_range=(rev4, rev4))
 
187
                            local_revid_range=(rev4, rev4))
187
188
        self.assertUnmerged([], [], tree.branch, tree2.branch,
188
 
            local_revid_range=(rev1, rev1))
 
189
                            local_revid_range=(rev1, rev1))
189
190
 
190
191
    def test_include_merged(self):
191
192
        tree = self.make_branch_and_tree('tree')
192
 
        rev1 = tree.commit('one', rev_id=b'rev1')
 
193
        tree.commit('one', rev_id=b'rev1')
193
194
 
194
195
        tree2 = tree.controldir.sprout('tree2').open_workingtree()
195
 
        rev2 = tree2.commit('two', rev_id=b'rev2')
 
196
        tree2.commit('two', rev_id=b'rev2')
196
197
        rev3 = tree2.commit('three', rev_id=b'rev3')
197
198
 
198
199
        tree3 = tree2.controldir.sprout('tree3').open_workingtree()
217
218
                            include_merged=True,
218
219
                            backward=True)
219
220
 
220
 
        self.assertUnmerged([], [('4', b'rev6', 0)],
 
221
        self.assertUnmerged(
 
222
            [], [('4', b'rev6', 0)],
221
223
            tree.branch, tree2.branch,
222
224
            include_merged=True, remote_revid_range=(rev6, rev6))
223
225
 
224
 
        self.assertUnmerged([], [('3', b'rev3', 0), ('3.1.1', b'rev4', 1)],
225
 
                    tree.branch, tree2.branch,
226
 
                    include_merged=True, remote_revid_range=(rev3, rev4))
 
226
        self.assertUnmerged(
 
227
            [], [('3', b'rev3', 0), ('3.1.1', b'rev4', 1)],
 
228
            tree.branch, tree2.branch,
 
229
            include_merged=True, remote_revid_range=(rev3, rev4))
227
230
 
228
 
        self.assertUnmerged([], [('4', b'rev6', 0), ('3.1.2', b'rev5', 1)],
229
 
                    tree.branch, tree2.branch,
230
 
                    include_merged=True, remote_revid_range=(rev5, rev6))
 
231
        self.assertUnmerged(
 
232
            [], [('4', b'rev6', 0), ('3.1.2', b'rev5', 1)],
 
233
            tree.branch, tree2.branch,
 
234
            include_merged=True, remote_revid_range=(rev5, rev6))
231
235
 
232
236
    def test_revision_range(self):
233
237
        local = self.make_branch_and_tree('local')
240
244
        lrevid3 = local.commit('three')
241
245
        lrevid4 = local.commit('four')
242
246
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
243
 
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
 
247
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0),
 
248
                        ('4', rrevid4, 0)]
244
249
 
245
250
        # control
246
251
        self.assertUnmerged(local_extra, remote_extra,
247
 
            local.branch, remote.branch)
 
252
                            local.branch, remote.branch)
248
253
        self.assertUnmerged(local_extra, remote_extra,
249
 
            local.branch, remote.branch, local_revid_range=(None, None),
250
 
            remote_revid_range=(None, None))
 
254
                            local.branch, remote.branch, local_revid_range=(
 
255
                                None, None),
 
256
                            remote_revid_range=(None, None))
251
257
 
252
258
        # exclude local revisions
253
 
        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
 
259
        self.assertUnmerged(
 
260
            [('2', lrevid2, 0)], remote_extra,
254
261
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
255
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
 
262
        self.assertUnmerged(
 
263
            [('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
256
264
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
257
 
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
 
265
        self.assertUnmerged(
 
266
            [('2', lrevid2, 0), ('3', lrevid3, 0)], None,
258
267
            local.branch, remote.branch, 'local',
259
268
            local_revid_range=(lrevid2, lrevid3))
260
269
 
261
270
        # exclude remote revisions
262
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
271
        self.assertUnmerged(
 
272
            local_extra, [('2', rrevid2, 0)],
263
273
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
264
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
274
        self.assertUnmerged(
 
275
            local_extra, [('2', rrevid2, 0)],
265
276
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
266
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
277
        self.assertUnmerged(
 
278
            local_extra, [('2', rrevid2, 0)],
267
279
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
268
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
280
        self.assertUnmerged(
 
281
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
269
282
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
270
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
283
        self.assertUnmerged(
 
284
            local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
271
285
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
272
 
        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
 
286
        self.assertUnmerged(
 
287
            local_extra, [('3', rrevid3, 0)],
273
288
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
274
289
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
275
 
            local.branch, remote.branch, 'remote',
276
 
            remote_revid_range=(rrevid2, rrevid3))
 
290
                            local.branch, remote.branch, 'remote',
 
291
                            remote_revid_range=(rrevid2, rrevid3))
277
292
 
278
293
        # exclude local and remote revisions
279
294
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
280
 
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
281
 
            remote_revid_range=(rrevid3, rrevid3))
 
295
                            local.branch, remote.branch, local_revid_range=(
 
296
                                lrevid3, lrevid3),
 
297
                            remote_revid_range=(rrevid3, rrevid3))