/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: 2017-07-23 22:06:41 UTC
  • mfrom: (6738 trunk)
  • mto: This revision was merged to the branch mainline in revision 6739.
  • Revision ID: jelmer@jelmer.uk-20170723220641-69eczax9bmv8d6kk
Merge trunk, address review comments.

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