2
Test the uncommit command.
4
from bzrlib.tests import TestCaseInTempDir
5
from bzrlib.errors import BzrError
7
class TestUncommit(TestCaseInTempDir):
1
# Copyright (C) 2005-2010 Canonical Ltd
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11
# GNU General Public License for more details.
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
"""Test the uncommit command."""
21
from bzrlib import uncommit
22
from bzrlib.bzrdir import BzrDirMetaFormat1
23
from bzrlib.errors import BoundBranchOutOfDate
24
from bzrlib.tests import TestCaseWithTransport
25
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
from bzrlib.tests.script import (
32
class TestUncommit(TestCaseWithTransport):
34
def create_simple_tree(self):
35
wt = self.make_branch_and_tree('tree')
36
self.build_tree(['tree/a', 'tree/b', 'tree/c'])
37
wt.add(['a', 'b', 'c'])
38
wt.commit('initial commit', rev_id='a1')
40
self.build_tree_contents([('tree/a', 'new contents of a\n')])
41
wt.commit('second commit', rev_id='a2')
8
45
def test_uncommit(self):
9
46
"""Test uncommit functionality."""
13
self.build_tree(['a', 'b', 'c'])
16
bzr('commit -m initial')
18
self.assertEquals(bzr('revno'), '1\n')
20
open('a', 'wb').write('new contents of a\n')
21
self.assertEquals(bzr('status'), 'modified:\n a\n')
22
bzr('commit -m second')
24
self.assertEquals(bzr('status'), '')
25
self.assertEquals(bzr('revno'), '2\n')
27
txt = bzr('uncommit --dry-run --force')
28
self.failIfEqual(txt.find('Dry-run'), -1)
30
self.assertEquals(bzr('status'), '')
31
self.assertEquals(bzr('revno'), '2\n')
33
txt = bzr('uncommit --force')
35
self.assertEquals(bzr('revno'), '1\n')
36
self.assertEquals(bzr('status'), 'modified:\n a\n')
47
wt = self.create_simple_tree()
50
out, err = self.run_bzr('uncommit --dry-run --force')
51
self.assertContainsRe(out, 'Dry-run')
52
self.assertNotContainsRe(out, 'initial commit')
53
self.assertContainsRe(out, 'second commit')
56
self.assertEqual(['a2'], wt.get_parent_ids())
58
# Uncommit, don't prompt
59
out, err = self.run_bzr('uncommit --force')
60
self.assertNotContainsRe(out, 'initial commit')
61
self.assertContainsRe(out, 'second commit')
63
# This should look like we are back in revno 1
64
self.assertEqual(['a1'], wt.get_parent_ids())
65
out, err = self.run_bzr('status')
66
self.assertEquals(out, 'modified:\n a\n')
68
def test_uncommit_interactive(self):
69
"""Uncommit seeks confirmation, and doesn't proceed without it."""
70
wt = self.create_simple_tree()
75
The above revision(s) will be removed.
76
2>Uncommit these revisions? ([y]es, [n]o): no
80
self.assertEqual(['a2'], wt.get_parent_ids())
82
def test_uncommit_no_history(self):
83
wt = self.make_branch_and_tree('tree')
84
out, err = self.run_bzr('uncommit --force', retcode=1)
85
self.assertEqual('', err)
86
self.assertEqual('No revisions to uncommit.\n', out)
88
def test_uncommit_checkout(self):
89
wt = self.create_simple_tree()
90
checkout_tree = wt.branch.create_checkout('checkout')
92
self.assertEqual(['a2'], checkout_tree.get_parent_ids())
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')
100
self.assertEqual(['a2'], checkout_tree.get_parent_ids())
102
out, err = self.run_bzr('uncommit --force')
103
self.assertNotContainsRe(out, 'initial commit')
104
self.assertContainsRe(out, 'second commit')
106
# uncommit in a checkout should uncommit the parent branch
107
# (but doesn't effect the other working tree)
108
self.assertEquals(['a1'], checkout_tree.get_parent_ids())
109
self.assertEquals('a1', wt.branch.last_revision())
110
self.assertEquals(['a2'], wt.get_parent_ids())
112
def test_uncommit_bound(self):
114
a = BzrDirMetaFormat1().initialize('a')
115
a.create_repository()
117
t_a = a.create_workingtree()
118
t_a.commit('commit 1')
119
t_a.commit('commit 2')
120
t_a.commit('commit 3')
121
b = t_a.branch.create_checkout('b').branch
123
self.assertEqual(b.last_revision_info()[0], 2)
124
self.assertEqual(t_a.branch.last_revision_info()[0], 2)
125
# update A's tree to not have the uncommitted revision referenced.
127
t_a.commit('commit 3b')
128
self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
132
def test_uncommit_bound_local(self):
133
t_a = self.make_branch_and_tree('a')
134
rev_id1 = t_a.commit('commit 1')
135
rev_id2 = t_a.commit('commit 2')
136
rev_id3 = t_a.commit('commit 3')
137
b = t_a.branch.create_checkout('b').branch
139
out, err = self.run_bzr(['uncommit', '--local', 'b', '--force'])
140
self.assertEqual(rev_id3, t_a.last_revision())
141
self.assertEqual((3, rev_id3), t_a.branch.last_revision_info())
142
self.assertEqual((2, rev_id2), b.last_revision_info())
144
def test_uncommit_revision(self):
145
wt = self.create_simple_tree()
148
out, err = self.run_bzr('uncommit -r1 --force')
150
self.assertNotContainsRe(out, 'initial commit')
151
self.assertContainsRe(out, 'second commit')
152
self.assertEqual(['a1'], wt.get_parent_ids())
153
self.assertEqual('a1', wt.branch.last_revision())
155
def test_uncommit_neg_1(self):
156
wt = self.create_simple_tree()
158
out, err = self.run_bzr('uncommit -r -1', retcode=1)
159
self.assertEqual('No revisions to uncommit.\n', out)
161
def test_uncommit_merges(self):
162
wt = self.create_simple_tree()
164
tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
166
tree2.commit('unchanged', rev_id='b3')
167
tree2.commit('unchanged', rev_id='b4')
169
wt.merge_from_branch(tree2.branch)
170
wt.commit('merge b4', rev_id='a3')
172
self.assertEqual(['a3'], wt.get_parent_ids())
175
out, err = self.run_bzr('uncommit --force')
177
self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
179
def test_uncommit_pending_merge(self):
180
wt = self.create_simple_tree()
181
tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
182
tree2.commit('unchanged', rev_id='b3')
184
wt.branch.fetch(tree2.branch)
185
wt.set_pending_merges(['b3'])
188
out, err = self.run_bzr('uncommit --force')
189
self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
191
def test_uncommit_multiple_merge(self):
192
wt = self.create_simple_tree()
194
tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
195
tree2.commit('unchanged', rev_id='b3')
197
tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
198
tree3.commit('unchanged', rev_id='c3')
200
wt.merge_from_branch(tree2.branch)
201
wt.commit('merge b3', rev_id='a3')
203
wt.merge_from_branch(tree3.branch)
204
wt.commit('merge c3', rev_id='a4')
206
self.assertEqual(['a4'], wt.get_parent_ids())
209
out, err = self.run_bzr('uncommit --force -r 2')
211
self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
213
def test_uncommit_merge_plus_pending(self):
214
wt = self.create_simple_tree()
216
tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
217
tree2.commit('unchanged', rev_id='b3')
218
tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
219
tree3.commit('unchanged', rev_id='c3')
221
wt.branch.fetch(tree2.branch)
222
wt.set_pending_merges(['b3'])
223
wt.commit('merge b3', rev_id='a3')
226
wt.merge_from_branch(tree3.branch)
228
self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
231
out, err = self.run_bzr('uncommit --force -r 2')
233
self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
235
def test_uncommit_shows_log_with_revision_id(self):
236
wt = self.create_simple_tree()
238
script = ScriptRunner()
239
script.run_script(self, """
241
$ bzr uncommit --force
245
The above revision(s) will be removed.
246
You can restore the old tip by running:
247
bzr pull . -r revid:a2
250
def test_uncommit_octopus_merge(self):
251
# Check that uncommit keeps the pending merges in the same order
252
# though it will also filter out ones in the ancestry
253
wt = self.create_simple_tree()
255
tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
256
tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
258
tree2.commit('unchanged', rev_id='b3')
259
tree3.commit('unchanged', rev_id='c3')
261
wt.merge_from_branch(tree2.branch)
262
wt.merge_from_branch(tree3.branch, force=True)
263
wt.commit('merge b3, c3', rev_id='a3')
265
tree2.commit('unchanged', rev_id='b4')
266
tree3.commit('unchanged', rev_id='c4')
268
wt.merge_from_branch(tree3.branch)
269
wt.merge_from_branch(tree2.branch, force=True)
270
wt.commit('merge b4, c4', rev_id='a4')
272
self.assertEqual(['a4'], wt.get_parent_ids())
275
out, err = self.run_bzr('uncommit --force -r 2')
277
self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
279
def test_uncommit_nonascii(self):
280
tree = self.make_branch_and_tree('tree')
281
tree.commit(u'\u1234 message')
282
out, err = self.run_bzr('uncommit --force tree', encoding='ascii')
283
self.assertContainsRe(out, r'\? message')
285
def test_uncommit_removes_tags(self):
286
tree = self.make_branch_and_tree('tree')
287
revid = tree.commit('message')
288
tree.branch.tags.set_tag("atag", revid)
289
out, err = self.run_bzr('uncommit --force tree')
290
self.assertEquals({}, tree.branch.tags.get_tag_dict())
292
def test_uncommit_keep_tags(self):
293
tree = self.make_branch_and_tree('tree')
294
revid = tree.commit('message')
295
tree.branch.tags.set_tag("atag", revid)
296
out, err = self.run_bzr('uncommit --keep-tags --force tree')
297
self.assertEquals({"atag": revid}, tree.branch.tags.get_tag_dict())
300
class TestSmartServerUncommit(TestCaseWithTransport):
302
def test_uncommit(self):
303
self.setup_smart_server_with_call_log()
304
t = self.make_branch_and_tree('from')
305
for count in range(2):
306
t.commit(message='commit %d' % count)
307
self.reset_smart_call_log()
308
out, err = self.run_bzr(['uncommit', '--force', self.get_url('from')])
309
# This figure represent the amount of work to perform this use case. It
310
# is entirely ok to reduce this number if a test fails due to rpc_count
311
# being too low. If rpc_count increases, more network roundtrips have
312
# become necessary for this use case. Please do not adjust this number
313
# upwards without agreement from bzr's network support maintainers.
314
self.assertLength(14, self.hpss_calls)
315
self.assertLength(1, self.hpss_connections)
316
self.assertThat(self.hpss_calls, ContainsNoVfsCalls)
319
class TestInconsistentDelta(TestCaseWithTransport):
320
# See https://bugs.launchpad.net/bzr/+bug/855155
321
# See https://bugs.launchpad.net/bzr/+bug/1100385
322
# bzr uncommit may result in error
323
# 'An inconsistent delta was supplied involving'
325
def test_inconsistent_delta(self):
326
# Script taken from https://bugs.launchpad.net/bzr/+bug/855155/comments/26
327
wt = self.make_branch_and_tree('test')
328
self.build_tree(['test/a/', 'test/a/b', 'test/a/c'])
329
wt.add(['a', 'a/b', 'a/c'])
330
wt.commit('initial commit', rev_id='a1')
331
wt.remove(['a/b', 'a/c'])
332
wt.commit('remove b and c', rev_id='a2')
333
self.run_bzr("uncommit --force test")
added
removed
bzrlib/tests/blackbox/test_uncommit.py
