/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: 2018-11-11 04:08:32 UTC
  • mto: (7143.16.20 even-more-cleanups)
  • mto: This revision was merged to the branch mainline in revision 7175.
  • Revision ID: jelmer@jelmer.uk-20181111040832-nsljjynzzwmznf3h
Run autopep8.

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')
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')
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')
218
219
                            backward=True)
219
220
 
220
221
        self.assertUnmerged([], [('4', b'rev6', 0)],
221
 
            tree.branch, tree2.branch,
222
 
            include_merged=True, remote_revid_range=(rev6, rev6))
 
222
                            tree.branch, tree2.branch,
 
223
                            include_merged=True, remote_revid_range=(rev6, rev6))
223
224
 
224
225
        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
                            tree.branch, tree2.branch,
 
227
                            include_merged=True, remote_revid_range=(rev3, rev4))
227
228
 
228
229
        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))
 
230
                            tree.branch, tree2.branch,
 
231
                            include_merged=True, remote_revid_range=(rev5, rev6))
231
232
 
232
233
    def test_revision_range(self):
233
234
        local = self.make_branch_and_tree('local')
240
241
        lrevid3 = local.commit('three')
241
242
        lrevid4 = local.commit('four')
242
243
        local_extra = [('2', lrevid2, 0), ('3', lrevid3, 0), ('4', lrevid4, 0)]
243
 
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0), ('4', rrevid4, 0)]
 
244
        remote_extra = [('2', rrevid2, 0), ('3', rrevid3, 0),
 
245
                        ('4', rrevid4, 0)]
244
246
 
245
247
        # control
246
248
        self.assertUnmerged(local_extra, remote_extra,
247
 
            local.branch, remote.branch)
 
249
                            local.branch, remote.branch)
248
250
        self.assertUnmerged(local_extra, remote_extra,
249
 
            local.branch, remote.branch, local_revid_range=(None, None),
250
 
            remote_revid_range=(None, None))
 
251
                            local.branch, remote.branch, local_revid_range=(
 
252
                                None, None),
 
253
                            remote_revid_range=(None, None))
251
254
 
252
255
        # exclude local revisions
253
256
        self.assertUnmerged([('2', lrevid2, 0)], remote_extra,
254
 
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
 
257
                            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid2))
255
258
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], remote_extra,
256
 
            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
 
259
                            local.branch, remote.branch, local_revid_range=(lrevid2, lrevid3))
257
260
        self.assertUnmerged([('2', lrevid2, 0), ('3', lrevid3, 0)], None,
258
 
            local.branch, remote.branch, 'local',
259
 
            local_revid_range=(lrevid2, lrevid3))
 
261
                            local.branch, remote.branch, 'local',
 
262
                            local_revid_range=(lrevid2, lrevid3))
260
263
 
261
264
        # exclude remote revisions
262
265
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
263
 
            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
264
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
265
 
            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
266
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
267
 
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
268
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
269
 
            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
270
 
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
271
 
            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
 
266
                            local.branch, remote.branch, remote_revid_range=(None, rrevid2))
 
267
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
268
                            local.branch, remote.branch, remote_revid_range=(lrevid1, rrevid2))
 
269
        self.assertUnmerged(local_extra, [('2', rrevid2, 0)],
 
270
                            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid2))
 
271
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
272
                            local.branch, remote.branch, remote_revid_range=(None, rrevid3))
 
273
        self.assertUnmerged(local_extra, [('2', rrevid2, 0), ('3', rrevid3, 0)],
 
274
                            local.branch, remote.branch, remote_revid_range=(rrevid2, rrevid3))
272
275
        self.assertUnmerged(local_extra, [('3', rrevid3, 0)],
273
 
            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
 
276
                            local.branch, remote.branch, remote_revid_range=(rrevid3, rrevid3))
274
277
        self.assertUnmerged(None, [('2', rrevid2, 0), ('3', rrevid3, 0)],
275
 
            local.branch, remote.branch, 'remote',
276
 
            remote_revid_range=(rrevid2, rrevid3))
 
278
                            local.branch, remote.branch, 'remote',
 
279
                            remote_revid_range=(rrevid2, rrevid3))
277
280
 
278
281
        # exclude local and remote revisions
279
282
        self.assertUnmerged([('3', lrevid3, 0)], [('3', rrevid3, 0)],
280
 
            local.branch, remote.branch, local_revid_range=(lrevid3, lrevid3),
281
 
            remote_revid_range=(rrevid3, rrevid3))
 
283
                            local.branch, remote.branch, local_revid_range=(
 
284
                                lrevid3, lrevid3),
 
285
                            remote_revid_range=(rrevid3, rrevid3))