/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-07-02 20:37:44 UTC
  • mfrom: (7025 work)
  • mto: This revision was merged to the branch mainline in revision 7027.
  • Revision ID: jelmer@jelmer.uk-20180702203744-3i0bimk0r5pfzjzl
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/blackbox/test_uncommit.py
82
82
    def test_uncommit_no_history(self):
83
83
        wt = self.make_branch_and_tree('tree')
84
84
        out, err = self.run_bzr('uncommit --force', retcode=1)
85
 
        self.assertEqual('', err)
86
 
        self.assertEqual('No revisions to uncommit.\n', out)
 
85
        self.assertEqual(b'', err)
 
86
        self.assertEqual(b'No revisions to uncommit.\n', out)
87
87
 
88
88
    def test_uncommit_checkout(self):
89
89
        wt = self.create_simple_tree()
90
90
        checkout_tree = wt.branch.create_checkout('checkout')
91
91
 
92
 
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
 
92
        self.assertEqual([b'a2'], checkout_tree.get_parent_ids())
93
93
 
94
94
        os.chdir('checkout')
95
95
        out, err = self.run_bzr('uncommit --dry-run --force')
96
 
        self.assertContainsRe(out, 'Dry-run')
97
 
        self.assertNotContainsRe(out, 'initial commit')
98
 
        self.assertContainsRe(out, 'second commit')
 
96
        self.assertContainsRe(out, b'Dry-run')
 
97
        self.assertNotContainsRe(out, b'initial commit')
 
98
        self.assertContainsRe(out, b'second commit')
99
99
 
100
 
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
 
100
        self.assertEqual([b'a2'], checkout_tree.get_parent_ids())
101
101
 
102
102
        out, err = self.run_bzr('uncommit --force')
103
 
        self.assertNotContainsRe(out, 'initial commit')
104
 
        self.assertContainsRe(out, 'second commit')
 
103
        self.assertNotContainsRe(out, b'initial commit')
 
104
        self.assertContainsRe(out, b'second commit')
105
105
 
106
106
        # uncommit in a checkout should uncommit the parent branch
107
107
        # (but doesn't effect the other working tree)
108
 
        self.assertEqual(['a1'], checkout_tree.get_parent_ids())
 
108
        self.assertEqual([b'a1'], checkout_tree.get_parent_ids())
109
109
        self.assertEqual('a1', wt.branch.last_revision())
110
 
        self.assertEqual(['a2'], wt.get_parent_ids())
 
110
        self.assertEqual([b'a2'], wt.get_parent_ids())
111
111
 
112
112
    def test_uncommit_bound(self):
113
113
        os.mkdir('a')
149
149
 
150
150
        self.assertNotContainsRe(out, 'initial commit')
151
151
        self.assertContainsRe(out, 'second commit')
152
 
        self.assertEqual(['a1'], wt.get_parent_ids())
153
 
        self.assertEqual('a1', wt.branch.last_revision())
 
152
        self.assertEqual([b'a1'], wt.get_parent_ids())
 
153
        self.assertEqual(b'a1', wt.branch.last_revision())
154
154
 
155
155
    def test_uncommit_neg_1(self):
156
156
        wt = self.create_simple_tree()
157
157
        os.chdir('tree')
158
158
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
159
 
        self.assertEqual('No revisions to uncommit.\n', out)
 
159
        self.assertEqual(b'No revisions to uncommit.\n', out)
160
160
 
161
161
    def test_uncommit_merges(self):
162
162
        wt = self.create_simple_tree()
169
169
        wt.merge_from_branch(tree2.branch)
170
170
        wt.commit('merge b4', rev_id=b'a3')
171
171
 
172
 
        self.assertEqual(['a3'], wt.get_parent_ids())
 
172
        self.assertEqual([b'a3'], wt.get_parent_ids())
173
173
 
174
174
        os.chdir('tree')
175
175
        out, err = self.run_bzr('uncommit --force')
176
176
 
177
 
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
 
177
        self.assertEqual([b'a2', b'b4'], wt.get_parent_ids())
178
178
 
179
179
    def test_uncommit_pending_merge(self):
180
180
        wt = self.create_simple_tree()
182
182
        tree2.commit('unchanged', rev_id=b'b3')
183
183
 
184
184
        wt.branch.fetch(tree2.branch)
185
 
        wt.set_pending_merges(['b3'])
 
185
        wt.set_pending_merges([b'b3'])
186
186
 
187
187
        os.chdir('tree')
188
188
        out, err = self.run_bzr('uncommit --force')
189
 
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
 
189
        self.assertEqual([b'a1', b'b3'], wt.get_parent_ids())
190
190
 
191
191
    def test_uncommit_multiple_merge(self):
192
192
        wt = self.create_simple_tree()
203
203
        wt.merge_from_branch(tree3.branch)
204
204
        wt.commit('merge c3', rev_id=b'a4')
205
205
 
206
 
        self.assertEqual(['a4'], wt.get_parent_ids())
 
206
        self.assertEqual([b'a4'], wt.get_parent_ids())
207
207
 
208
208
        os.chdir('tree')
209
209
        out, err = self.run_bzr('uncommit --force -r 2')
210
210
 
211
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
211
        self.assertEqual([b'a2', b'b3', b'c3'], wt.get_parent_ids())
212
212
 
213
213
    def test_uncommit_merge_plus_pending(self):
214
214
        wt = self.create_simple_tree()
219
219
        tree3.commit('unchanged', rev_id=b'c3')
220
220
 
221
221
        wt.branch.fetch(tree2.branch)
222
 
        wt.set_pending_merges(['b3'])
 
222
        wt.set_pending_merges([b'b3'])
223
223
        wt.commit('merge b3', rev_id=b'a3')
224
224
 
225
 
 
226
225
        wt.merge_from_branch(tree3.branch)
227
226
 
228
 
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
 
227
        self.assertEqual([b'a3', b'c3'], wt.get_parent_ids())
229
228
 
230
229
        os.chdir('tree')
231
230
        out, err = self.run_bzr('uncommit --force -r 2')
232
231
 
233
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
232
        self.assertEqual([b'a2', b'b3', b'c3'], wt.get_parent_ids())
234
233
 
235
234
    def test_uncommit_shows_log_with_revision_id(self):
236
235
        wt = self.create_simple_tree()
269
268
        wt.merge_from_branch(tree2.branch, force=True)
270
269
        wt.commit('merge b4, c4', rev_id=b'a4')
271
270
 
272
 
        self.assertEqual(['a4'], wt.get_parent_ids())
 
271
        self.assertEqual([b'a4'], wt.get_parent_ids())
273
272
 
274
273
        os.chdir('tree')
275
274
        out, err = self.run_bzr('uncommit --force -r 2')
276
275
 
277
 
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
 
276
        self.assertEqual([b'a2', b'c4', b'b4'], wt.get_parent_ids())
278
277
 
279
278
    def test_uncommit_nonascii(self):
280
279
        tree = self.make_branch_and_tree('tree')
281
280
        tree.commit(u'\u1234 message')
282
281
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
283
 
        self.assertContainsRe(out, r'\? message')
 
282
        self.assertContainsRe(out, br'\? message')
284
283
 
285
284
    def test_uncommit_removes_tags(self):
286
285
        tree = self.make_branch_and_tree('tree')