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

  • Committer: Martin Pool
  • Date: 2009-07-27 06:28:35 UTC
  • mto: This revision was merged to the branch mainline in revision 4587.
  • Revision ID: mbp@sourcefrog.net-20090727062835-o66p8it658tq1sma
Add CountedLock.get_physical_lock_status

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005-2011, 2013, 2016 Canonical Ltd
 
1
# Copyright (C) 2005, 2006, 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
18
18
 
19
19
import os
20
20
 
21
 
from breezy import uncommit
22
 
from breezy.bzr.bzrdir import BzrDirMetaFormat1
23
 
from breezy.errors import BoundBranchOutOfDate
24
 
from breezy.tests import TestCaseWithTransport
25
 
from breezy.tests.matchers import ContainsNoVfsCalls
26
 
from breezy.tests.script import (
27
 
    run_script,
28
 
    ScriptRunner,
29
 
    )
 
21
from bzrlib import uncommit, workingtree
 
22
from bzrlib.bzrdir import BzrDirMetaFormat1
 
23
from bzrlib.errors import BzrError, BoundBranchOutOfDate
 
24
from bzrlib.tests import TestCaseWithTransport
30
25
 
31
26
 
32
27
class TestUncommit(TestCaseWithTransport):
35
30
        wt = self.make_branch_and_tree('tree')
36
31
        self.build_tree(['tree/a', 'tree/b', 'tree/c'])
37
32
        wt.add(['a', 'b', 'c'])
38
 
        wt.commit('initial commit', rev_id=b'a1')
 
33
        wt.commit('initial commit', rev_id='a1')
39
34
 
40
 
        self.build_tree_contents([('tree/a', b'new contents of a\n')])
41
 
        wt.commit('second commit', rev_id=b'a2')
 
35
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
 
36
        wt.commit('second commit', rev_id='a2')
42
37
 
43
38
        return wt
44
39
 
53
48
        self.assertContainsRe(out, 'second commit')
54
49
 
55
50
        # Nothing has changed
56
 
        self.assertEqual([b'a2'], wt.get_parent_ids())
 
51
        self.assertEqual(['a2'], wt.get_parent_ids())
57
52
 
58
53
        # Uncommit, don't prompt
59
54
        out, err = self.run_bzr('uncommit --force')
61
56
        self.assertContainsRe(out, 'second commit')
62
57
 
63
58
        # This should look like we are back in revno 1
64
 
        self.assertEqual([b'a1'], wt.get_parent_ids())
 
59
        self.assertEqual(['a1'], wt.get_parent_ids())
65
60
        out, err = self.run_bzr('status')
66
 
        self.assertEqual(out, 'modified:\n  a\n')
67
 
 
68
 
    def test_uncommit_interactive(self):
69
 
        """Uncommit seeks confirmation, and doesn't proceed without it."""
70
 
        wt = self.create_simple_tree()
71
 
        os.chdir('tree')
72
 
        run_script(self, """
73
 
        $ brz uncommit
74
 
        ...
75
 
        The above revision(s) will be removed.
76
 
        2>Uncommit these revisions? ([y]es, [n]o): no
77
 
        <n
78
 
        Canceled
79
 
        """)
80
 
        self.assertEqual([b'a2'], wt.get_parent_ids())
 
61
        self.assertEquals(out, 'modified:\n  a\n')
81
62
 
82
63
    def test_uncommit_no_history(self):
83
64
        wt = self.make_branch_and_tree('tree')
89
70
        wt = self.create_simple_tree()
90
71
        checkout_tree = wt.branch.create_checkout('checkout')
91
72
 
92
 
        self.assertEqual([b'a2'], checkout_tree.get_parent_ids())
 
73
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
93
74
 
94
75
        os.chdir('checkout')
95
76
        out, err = self.run_bzr('uncommit --dry-run --force')
97
78
        self.assertNotContainsRe(out, 'initial commit')
98
79
        self.assertContainsRe(out, 'second commit')
99
80
 
100
 
        self.assertEqual([b'a2'], checkout_tree.get_parent_ids())
 
81
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
101
82
 
102
83
        out, err = self.run_bzr('uncommit --force')
103
84
        self.assertNotContainsRe(out, 'initial commit')
105
86
 
106
87
        # uncommit in a checkout should uncommit the parent branch
107
88
        # (but doesn't effect the other working tree)
108
 
        self.assertEqual([b'a1'], checkout_tree.get_parent_ids())
109
 
        self.assertEqual(b'a1', wt.branch.last_revision())
110
 
        self.assertEqual([b'a2'], wt.get_parent_ids())
 
89
        self.assertEquals(['a1'], checkout_tree.get_parent_ids())
 
90
        self.assertEquals('a1', wt.branch.last_revision())
 
91
        self.assertEquals(['a2'], wt.get_parent_ids())
111
92
 
112
93
    def test_uncommit_bound(self):
113
94
        os.mkdir('a')
120
101
        t_a.commit('commit 3')
121
102
        b = t_a.branch.create_checkout('b').branch
122
103
        uncommit.uncommit(b)
123
 
        self.assertEqual(b.last_revision_info()[0], 2)
124
 
        self.assertEqual(t_a.branch.last_revision_info()[0], 2)
 
104
        self.assertEqual(len(b.revision_history()), 2)
 
105
        self.assertEqual(len(t_a.branch.revision_history()), 2)
125
106
        # update A's tree to not have the uncommitted revision referenced.
126
107
        t_a.update()
127
108
        t_a.commit('commit 3b')
149
130
 
150
131
        self.assertNotContainsRe(out, 'initial commit')
151
132
        self.assertContainsRe(out, 'second commit')
152
 
        self.assertEqual([b'a1'], wt.get_parent_ids())
153
 
        self.assertEqual(b'a1', wt.branch.last_revision())
 
133
        self.assertEqual(['a1'], wt.get_parent_ids())
 
134
        self.assertEqual('a1', wt.branch.last_revision())
154
135
 
155
136
    def test_uncommit_neg_1(self):
156
137
        wt = self.create_simple_tree()
161
142
    def test_uncommit_merges(self):
162
143
        wt = self.create_simple_tree()
163
144
 
164
 
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
 
145
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
165
146
 
166
 
        tree2.commit('unchanged', rev_id=b'b3')
167
 
        tree2.commit('unchanged', rev_id=b'b4')
 
147
        tree2.commit('unchanged', rev_id='b3')
 
148
        tree2.commit('unchanged', rev_id='b4')
168
149
 
169
150
        wt.merge_from_branch(tree2.branch)
170
 
        wt.commit('merge b4', rev_id=b'a3')
 
151
        wt.commit('merge b4', rev_id='a3')
171
152
 
172
 
        self.assertEqual([b'a3'], wt.get_parent_ids())
 
153
        self.assertEqual(['a3'], wt.get_parent_ids())
173
154
 
174
155
        os.chdir('tree')
175
156
        out, err = self.run_bzr('uncommit --force')
176
157
 
177
 
        self.assertEqual([b'a2', b'b4'], wt.get_parent_ids())
 
158
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
178
159
 
179
160
    def test_uncommit_pending_merge(self):
180
161
        wt = self.create_simple_tree()
181
 
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
182
 
        tree2.commit('unchanged', rev_id=b'b3')
 
162
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
163
        tree2.commit('unchanged', rev_id='b3')
183
164
 
184
165
        wt.branch.fetch(tree2.branch)
185
 
        wt.set_pending_merges([b'b3'])
 
166
        wt.set_pending_merges(['b3'])
186
167
 
187
168
        os.chdir('tree')
188
169
        out, err = self.run_bzr('uncommit --force')
189
 
        self.assertEqual([b'a1', b'b3'], wt.get_parent_ids())
 
170
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
190
171
 
191
172
    def test_uncommit_multiple_merge(self):
192
173
        wt = self.create_simple_tree()
193
174
 
194
 
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
195
 
        tree2.commit('unchanged', rev_id=b'b3')
 
175
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
176
        tree2.commit('unchanged', rev_id='b3')
196
177
 
197
 
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
198
 
        tree3.commit('unchanged', rev_id=b'c3')
 
178
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
179
        tree3.commit('unchanged', rev_id='c3')
199
180
 
200
181
        wt.merge_from_branch(tree2.branch)
201
 
        wt.commit('merge b3', rev_id=b'a3')
 
182
        wt.commit('merge b3', rev_id='a3')
202
183
 
203
184
        wt.merge_from_branch(tree3.branch)
204
 
        wt.commit('merge c3', rev_id=b'a4')
 
185
        wt.commit('merge c3', rev_id='a4')
205
186
 
206
 
        self.assertEqual([b'a4'], wt.get_parent_ids())
 
187
        self.assertEqual(['a4'], wt.get_parent_ids())
207
188
 
208
189
        os.chdir('tree')
209
190
        out, err = self.run_bzr('uncommit --force -r 2')
210
191
 
211
 
        self.assertEqual([b'a2', b'b3', b'c3'], wt.get_parent_ids())
 
192
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
212
193
 
213
194
    def test_uncommit_merge_plus_pending(self):
214
195
        wt = self.create_simple_tree()
215
196
 
216
 
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
217
 
        tree2.commit('unchanged', rev_id=b'b3')
218
 
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
219
 
        tree3.commit('unchanged', rev_id=b'c3')
 
197
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
198
        tree2.commit('unchanged', rev_id='b3')
 
199
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
200
        tree3.commit('unchanged', rev_id='c3')
220
201
 
221
202
        wt.branch.fetch(tree2.branch)
222
 
        wt.set_pending_merges([b'b3'])
223
 
        wt.commit('merge b3', rev_id=b'a3')
 
203
        wt.set_pending_merges(['b3'])
 
204
        wt.commit('merge b3', rev_id='a3')
 
205
 
224
206
 
225
207
        wt.merge_from_branch(tree3.branch)
226
208
 
227
 
        self.assertEqual([b'a3', b'c3'], wt.get_parent_ids())
 
209
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
228
210
 
229
211
        os.chdir('tree')
230
212
        out, err = self.run_bzr('uncommit --force -r 2')
231
213
 
232
 
        self.assertEqual([b'a2', b'b3', b'c3'], wt.get_parent_ids())
 
214
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
233
215
 
234
216
    def test_uncommit_shows_log_with_revision_id(self):
235
217
        wt = self.create_simple_tree()
236
218
 
237
 
        script = ScriptRunner()
238
 
        script.run_script(self, """
239
 
$ cd tree
240
 
$ brz uncommit --force
241
 
    2 ...
242
 
      second commit
243
 
...
244
 
The above revision(s) will be removed.
245
 
You can restore the old tip by running:
246
 
  brz pull . -r revid:a2
247
 
""")
248
 
 
249
 
    def test_uncommit_shows_pull_with_location(self):
250
 
        wt = self.create_simple_tree()
251
 
 
252
 
        script = ScriptRunner()
253
 
        script.run_script(self, """
254
 
$ brz uncommit --force tree
255
 
    2 ...
256
 
      second commit
257
 
...
258
 
The above revision(s) will be removed.
259
 
You can restore the old tip by running:
260
 
  brz pull -d tree tree -r revid:a2
261
 
""")
 
219
        out, err = self.run_bzr('uncommit --force', working_dir='tree')
 
220
        self.assertContainsRe(out, r'second commit')
 
221
        self.assertContainsRe(err, r'You can restore the old tip by running')
 
222
        self.assertContainsRe(err, r'bzr pull . -r revid:a2')
262
223
 
263
224
    def test_uncommit_octopus_merge(self):
264
225
        # Check that uncommit keeps the pending merges in the same order
265
226
        # though it will also filter out ones in the ancestry
266
227
        wt = self.create_simple_tree()
267
228
 
268
 
        tree2 = wt.controldir.sprout('tree2').open_workingtree()
269
 
        tree3 = wt.controldir.sprout('tree3').open_workingtree()
270
 
 
271
 
        tree2.commit('unchanged', rev_id=b'b3')
272
 
        tree3.commit('unchanged', rev_id=b'c3')
273
 
 
274
 
        wt.merge_from_branch(tree2.branch)
275
 
        wt.merge_from_branch(tree3.branch, force=True)
276
 
        wt.commit('merge b3, c3', rev_id=b'a3')
277
 
 
278
 
        tree2.commit('unchanged', rev_id=b'b4')
279
 
        tree3.commit('unchanged', rev_id=b'c4')
280
 
 
281
 
        wt.merge_from_branch(tree3.branch)
282
 
        wt.merge_from_branch(tree2.branch, force=True)
283
 
        wt.commit('merge b4, c4', rev_id=b'a4')
284
 
 
285
 
        self.assertEqual([b'a4'], wt.get_parent_ids())
 
229
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
230
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
 
231
 
 
232
        tree2.commit('unchanged', rev_id='b3')
 
233
        tree3.commit('unchanged', rev_id='c3')
 
234
 
 
235
        wt.merge_from_branch(tree2.branch)
 
236
        wt.merge_from_branch(tree3.branch)
 
237
        wt.commit('merge b3, c3', rev_id='a3')
 
238
 
 
239
        tree2.commit('unchanged', rev_id='b4')
 
240
        tree3.commit('unchanged', rev_id='c4')
 
241
 
 
242
        wt.merge_from_branch(tree3.branch)
 
243
        wt.merge_from_branch(tree2.branch)
 
244
        wt.commit('merge b4, c4', rev_id='a4')
 
245
 
 
246
        self.assertEqual(['a4'], wt.get_parent_ids())
286
247
 
287
248
        os.chdir('tree')
288
249
        out, err = self.run_bzr('uncommit --force -r 2')
289
250
 
290
 
        self.assertEqual([b'a2', b'c4', b'b4'], wt.get_parent_ids())
 
251
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
291
252
 
292
253
    def test_uncommit_nonascii(self):
293
254
        tree = self.make_branch_and_tree('tree')
294
255
        tree.commit(u'\u1234 message')
295
256
        out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
296
257
        self.assertContainsRe(out, r'\? message')
297
 
 
298
 
    def test_uncommit_removes_tags(self):
299
 
        tree = self.make_branch_and_tree('tree')
300
 
        revid = tree.commit('message')
301
 
        tree.branch.tags.set_tag("atag", revid)
302
 
        out, err = self.run_bzr('uncommit --force tree')
303
 
        self.assertEqual({}, tree.branch.tags.get_tag_dict())
304
 
 
305
 
    def test_uncommit_keep_tags(self):
306
 
        tree = self.make_branch_and_tree('tree')
307
 
        revid = tree.commit('message')
308
 
        tree.branch.tags.set_tag("atag", revid)
309
 
        out, err = self.run_bzr('uncommit --keep-tags --force tree')
310
 
        self.assertEqual({"atag": revid}, tree.branch.tags.get_tag_dict())
311
 
 
312
 
 
313
 
class TestSmartServerUncommit(TestCaseWithTransport):
314
 
 
315
 
    def test_uncommit(self):
316
 
        self.setup_smart_server_with_call_log()
317
 
        t = self.make_branch_and_tree('from')
318
 
        for count in range(2):
319
 
            t.commit(message='commit %d' % count)
320
 
        self.reset_smart_call_log()
321
 
        out, err = self.run_bzr(['uncommit', '--force', self.get_url('from')])
322
 
        # This figure represent the amount of work to perform this use case. It
323
 
        # is entirely ok to reduce this number if a test fails due to rpc_count
324
 
        # being too low. If rpc_count increases, more network roundtrips have
325
 
        # become necessary for this use case. Please do not adjust this number
326
 
        # upwards without agreement from bzr's network support maintainers.
327
 
        self.assertLength(14, self.hpss_calls)
328
 
        self.assertLength(1, self.hpss_connections)
329
 
        self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
330
 
 
331
 
 
332
 
class TestInconsistentDelta(TestCaseWithTransport):
333
 
    # See https://bugs.launchpad.net/bzr/+bug/855155
334
 
    # See https://bugs.launchpad.net/bzr/+bug/1100385
335
 
    # brz uncommit may result in error
336
 
    # 'An inconsistent delta was supplied involving'
337
 
 
338
 
    def test_inconsistent_delta(self):
339
 
        # Script taken from https://bugs.launchpad.net/bzr/+bug/855155/comments/26
340
 
        wt = self.make_branch_and_tree('test')
341
 
        self.build_tree(['test/a/', 'test/a/b', 'test/a/c'])
342
 
        wt.add(['a', 'a/b', 'a/c'])
343
 
        wt.commit('initial commit', rev_id=b'a1')
344
 
        wt.remove(['a/b', 'a/c'])
345
 
        wt.commit('remove b and c', rev_id=b'a2')
346
 
        self.run_bzr("uncommit --force test")