/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/blackbox/test_uncommit.py

  • Committer: Jelmer Vernooij
  • Date: 2018-02-18 15:21:06 UTC
  • mto: This revision was merged to the branch mainline in revision 6928.
  • Revision ID: jelmer@jelmer.uk-20180218152106-m8bmfurzlspweyu4
Yet more bees.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_uncommit.py
35
35
        wt = self.make_branch_and_tree('tree')
36
36
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
37
37
        wt.add(['a', 'b', 'c'])
38
 
        wt.commit('initial commit', rev_id='a1')
 
38
        wt.commit('initial commit', rev_id=b'a1')
39
39
 
40
 
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
41
 
        wt.commit('second commit', rev_id='a2')
 
40
        self.build_tree_contents([('tree/a', b'new contents of a\n')])
 
41
        wt.commit('second commit', rev_id=b'a2')
42
42
 
43
43
        return wt
44
44
 
163
163
 
164
164
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
165
165
 
166
 
        tree2.commit('unchanged', rev_id='b3')
167
 
        tree2.commit('unchanged', rev_id='b4')
 
166
        tree2.commit('unchanged', rev_id=b'b3')
 
167
        tree2.commit('unchanged', rev_id=b'b4')
168
168
 
169
169
        wt.merge_from_branch(tree2.branch)
170
 
        wt.commit('merge b4', rev_id='a3')
 
170
        wt.commit('merge b4', rev_id=b'a3')
171
171
 
172
172
        self.assertEqual(['a3'], wt.get_parent_ids())
173
173
 
179
179
    def test_uncommit_pending_merge(self):
180
180
        wt = self.create_simple_tree()
181
181
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
182
 
        tree2.commit('unchanged', rev_id='b3')
 
182
        tree2.commit('unchanged', rev_id=b'b3')
183
183
 
184
184
        wt.branch.fetch(tree2.branch)
185
185
        wt.set_pending_merges(['b3'])
192
192
        wt = self.create_simple_tree()
193
193
 
194
194
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
195
 
        tree2.commit('unchanged', rev_id='b3')
 
195
        tree2.commit('unchanged', rev_id=b'b3')
196
196
 
197
197
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
198
 
        tree3.commit('unchanged', rev_id='c3')
 
198
        tree3.commit('unchanged', rev_id=b'c3')
199
199
 
200
200
        wt.merge_from_branch(tree2.branch)
201
 
        wt.commit('merge b3', rev_id='a3')
 
201
        wt.commit('merge b3', rev_id=b'a3')
202
202
 
203
203
        wt.merge_from_branch(tree3.branch)
204
 
        wt.commit('merge c3', rev_id='a4')
 
204
        wt.commit('merge c3', rev_id=b'a4')
205
205
 
206
206
        self.assertEqual(['a4'], wt.get_parent_ids())
207
207
 
214
214
        wt = self.create_simple_tree()
215
215
 
216
216
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
217
 
        tree2.commit('unchanged', rev_id='b3')
 
217
        tree2.commit('unchanged', rev_id=b'b3')
218
218
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
219
 
        tree3.commit('unchanged', rev_id='c3')
 
219
        tree3.commit('unchanged', rev_id=b'c3')
220
220
 
221
221
        wt.branch.fetch(tree2.branch)
222
222
        wt.set_pending_merges(['b3'])
223
 
        wt.commit('merge b3', rev_id='a3')
 
223
        wt.commit('merge b3', rev_id=b'a3')
224
224
 
225
225
 
226
226
        wt.merge_from_branch(tree3.branch)
255
255
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
256
256
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
257
257
 
258
 
        tree2.commit('unchanged', rev_id='b3')
259
 
        tree3.commit('unchanged', rev_id='c3')
 
258
        tree2.commit('unchanged', rev_id=b'b3')
 
259
        tree3.commit('unchanged', rev_id=b'c3')
260
260
 
261
261
        wt.merge_from_branch(tree2.branch)
262
262
        wt.merge_from_branch(tree3.branch, force=True)
263
 
        wt.commit('merge b3, c3', rev_id='a3')
 
263
        wt.commit('merge b3, c3', rev_id=b'a3')
264
264
 
265
 
        tree2.commit('unchanged', rev_id='b4')
266
 
        tree3.commit('unchanged', rev_id='c4')
 
265
        tree2.commit('unchanged', rev_id=b'b4')
 
266
        tree3.commit('unchanged', rev_id=b'c4')
267
267
 
268
268
        wt.merge_from_branch(tree3.branch)
269
269
        wt.merge_from_branch(tree2.branch, force=True)
270
 
        wt.commit('merge b4, c4', rev_id='a4')
 
270
        wt.commit('merge b4, c4', rev_id=b'a4')
271
271
 
272
272
        self.assertEqual(['a4'], wt.get_parent_ids())
273
273
 
327
327
        wt = self.make_branch_and_tree('test')
328
328
        self.build_tree(['test/a/', 'test/a/b', 'test/a/c'])
329
329
        wt.add(['a', 'a/b', 'a/c'])
330
 
        wt.commit('initial commit', rev_id='a1')
 
330
        wt.commit('initial commit', rev_id=b'a1')
331
331
        wt.remove(['a/b', 'a/c'])
332
 
        wt.commit('remove b and c', rev_id='a2')
 
332
        wt.commit('remove b and c', rev_id=b'a2')
333
333
        self.run_bzr("uncommit --force test")