← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_uncommit.py

  • Committer: John Arbash Meinel
  • Date: 2007-04-12 20:27:42 UTC
  • mto: (2399.1.15 doc-cleanup)
  • mto: This revision was merged to the branch mainline in revision 2431.
  • Revision ID: john@arbash-meinel.com-20070412202742-4cr2qmchdfe9mg7n
Cherrypick just the epydoc builder changes.
This is just the piece of change that makes 'make api-docs' work,
without any actual documentation changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_uncommit.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Test the uncommit command."""
18
18
 
19
19
import os
20
20
 
21
 
from bzrlib import uncommit
 
21
from bzrlib import uncommit, workingtree
22
22
from bzrlib.bzrdir import BzrDirMetaFormat1
23
 
from bzrlib.errors import BoundBranchOutOfDate
 
23
from bzrlib.errors import BzrError, BoundBranchOutOfDate
24
24
from bzrlib.tests import TestCaseWithTransport
25
 
from bzrlib.tests.matchers import ContainsNoVfsCalls
26
 
from bzrlib.tests.script import (
27
 
    run_script,
28
 
    ScriptRunner,
29
 
    )
30
25
 
31
26
 
32
27
class TestUncommit(TestCaseWithTransport):
37
32
        wt.add(['a', 'b', 'c'])
38
33
        wt.commit('initial commit', rev_id='a1')
39
34
 
40
 
        self.build_tree_contents([('tree/a', 'new contents of a\n')])
 
35
        open('tree/a', 'wb').write('new contents of a\n')
41
36
        wt.commit('second commit', rev_id='a2')
42
37
 
43
38
        return wt
47
42
        wt = self.create_simple_tree()
48
43
 
49
44
        os.chdir('tree')
50
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
45
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
51
46
        self.assertContainsRe(out, 'Dry-run')
52
47
        self.assertNotContainsRe(out, 'initial commit')
53
48
        self.assertContainsRe(out, 'second commit')
56
51
        self.assertEqual(['a2'], wt.get_parent_ids())
57
52
 
58
53
        # Uncommit, don't prompt
59
 
        out, err = self.run_bzr('uncommit --force')
 
54
        out, err = self.run_bzr('uncommit', '--force')
60
55
        self.assertNotContainsRe(out, 'initial commit')
61
56
        self.assertContainsRe(out, 'second commit')
62
57
 
65
60
        out, err = self.run_bzr('status')
66
61
        self.assertEquals(out, 'modified:\n  a\n')
67
62
 
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
 
        $ bzr 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(['a2'], wt.get_parent_ids())
81
 
 
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)
87
 
 
88
63
    def test_uncommit_checkout(self):
89
64
        wt = self.create_simple_tree()
90
65
        checkout_tree = wt.branch.create_checkout('checkout')
92
67
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
93
68
 
94
69
        os.chdir('checkout')
95
 
        out, err = self.run_bzr('uncommit --dry-run --force')
 
70
        out, err = self.run_bzr('uncommit', '--dry-run', '--force')
96
71
        self.assertContainsRe(out, 'Dry-run')
97
72
        self.assertNotContainsRe(out, 'initial commit')
98
73
        self.assertContainsRe(out, 'second commit')
99
74
 
100
75
        self.assertEqual(['a2'], checkout_tree.get_parent_ids())
101
76
 
102
 
        out, err = self.run_bzr('uncommit --force')
 
77
        out, err = self.run_bzr('uncommit', '--force')
103
78
        self.assertNotContainsRe(out, 'initial commit')
104
79
        self.assertContainsRe(out, 'second commit')
105
80
 
120
95
        t_a.commit('commit 3')
121
96
        b = t_a.branch.create_checkout('b').branch
122
97
        uncommit.uncommit(b)
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.
 
98
        self.assertEqual(len(b.revision_history()), 2)
 
99
        self.assertEqual(len(t_a.branch.revision_history()), 2)
 
100
        # update A's tree to not have the uncomitted revision referenced.
126
101
        t_a.update()
127
102
        t_a.commit('commit 3b')
128
103
        self.assertRaises(BoundBranchOutOfDate, uncommit.uncommit, b)
129
104
        b.pull(t_a.branch)
130
105
        uncommit.uncommit(b)
131
106
 
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
138
 
 
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())
143
 
 
144
107
    def test_uncommit_revision(self):
145
108
        wt = self.create_simple_tree()
146
109
 
147
110
        os.chdir('tree')
148
 
        out, err = self.run_bzr('uncommit -r1 --force')
 
111
        out, err = self.run_bzr('uncommit', '-r1', '--force')
149
112
 
150
113
        self.assertNotContainsRe(out, 'initial commit')
151
114
        self.assertContainsRe(out, 'second commit')
155
118
    def test_uncommit_neg_1(self):
156
119
        wt = self.create_simple_tree()
157
120
        os.chdir('tree')
158
 
        out, err = self.run_bzr('uncommit -r -1', retcode=1)
 
121
        out, err = self.run_bzr('uncommit', '-r', '-1', retcode=1)
159
122
        self.assertEqual('No revisions to uncommit.\n', out)
160
123
 
161
124
    def test_uncommit_merges(self):
172
135
        self.assertEqual(['a3'], wt.get_parent_ids())
173
136
 
174
137
        os.chdir('tree')
175
 
        out, err = self.run_bzr('uncommit --force')
 
138
        out, err = self.run_bzr('uncommit', '--force')
176
139
 
177
140
        self.assertEqual(['a2', 'b4'], wt.get_parent_ids())
178
141
 
185
148
        wt.set_pending_merges(['b3'])
186
149
 
187
150
        os.chdir('tree')
188
 
        out, err = self.run_bzr('uncommit --force')
 
151
        out, err = self.run_bzr('uncommit', '--force')
189
152
        self.assertEqual(['a1', 'b3'], wt.get_parent_ids())
190
153
 
191
154
    def test_uncommit_multiple_merge(self):
192
155
        wt = self.create_simple_tree()
193
156
 
194
157
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
158
 
195
159
        tree2.commit('unchanged', rev_id='b3')
196
160
 
197
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
198
 
        tree3.commit('unchanged', rev_id='c3')
199
 
 
200
161
        wt.merge_from_branch(tree2.branch)
201
162
        wt.commit('merge b3', rev_id='a3')
202
163
 
203
 
        wt.merge_from_branch(tree3.branch)
204
 
        wt.commit('merge c3', rev_id='a4')
 
164
        tree2.commit('unchanged', rev_id='b4')
 
165
 
 
166
        wt.merge_from_branch(tree2.branch)
 
167
        wt.commit('merge b4', rev_id='a4')
205
168
 
206
169
        self.assertEqual(['a4'], wt.get_parent_ids())
207
170
 
208
171
        os.chdir('tree')
209
 
        out, err = self.run_bzr('uncommit --force -r 2')
 
172
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
210
173
 
211
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
 
174
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
212
175
 
213
176
    def test_uncommit_merge_plus_pending(self):
214
177
        wt = self.create_simple_tree()
215
178
 
216
179
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
 
180
 
217
181
        tree2.commit('unchanged', rev_id='b3')
218
 
        tree3 = wt.bzrdir.sprout('tree3').open_workingtree()
219
 
        tree3.commit('unchanged', rev_id='c3')
220
 
 
221
182
        wt.branch.fetch(tree2.branch)
222
183
        wt.set_pending_merges(['b3'])
223
184
        wt.commit('merge b3', rev_id='a3')
224
185
 
225
 
 
226
 
        wt.merge_from_branch(tree3.branch)
227
 
 
228
 
        self.assertEqual(['a3', 'c3'], wt.get_parent_ids())
 
186
        tree2.commit('unchanged', rev_id='b4')
 
187
        wt.branch.fetch(tree2.branch)
 
188
        wt.set_pending_merges(['b4'])
 
189
 
 
190
        self.assertEqual(['a3', 'b4'], wt.get_parent_ids())
229
191
 
230
192
        os.chdir('tree')
231
 
        out, err = self.run_bzr('uncommit --force -r 2')
232
 
 
233
 
        self.assertEqual(['a2', 'b3', 'c3'], wt.get_parent_ids())
234
 
 
235
 
    def test_uncommit_shows_log_with_revision_id(self):
236
 
        wt = self.create_simple_tree()
237
 
 
238
 
        script = ScriptRunner()
239
 
        script.run_script(self, """
240
 
$ cd tree
241
 
$ bzr uncommit --force 
242
 
    2 ...
243
 
      second commit
244
 
...
245
 
The above revision(s) will be removed.
246
 
You can restore the old tip by running:
247
 
  bzr pull . -r revid:a2
248
 
""")
 
193
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
194
 
 
195
        self.assertEqual(['a2', 'b3', 'b4'], wt.get_parent_ids())
249
196
 
250
197
    def test_uncommit_octopus_merge(self):
251
198
        # Check that uncommit keeps the pending merges in the same order
252
 
        # though it will also filter out ones in the ancestry
253
199
        wt = self.create_simple_tree()
254
200
 
255
201
        tree2 = wt.bzrdir.sprout('tree2').open_workingtree()
257
203
 
258
204
        tree2.commit('unchanged', rev_id='b3')
259
205
        tree3.commit('unchanged', rev_id='c3')
260
 
 
 
206
        
261
207
        wt.merge_from_branch(tree2.branch)
262
 
        wt.merge_from_branch(tree3.branch, force=True)
 
208
        wt.merge_from_branch(tree3.branch)
263
209
        wt.commit('merge b3, c3', rev_id='a3')
264
210
 
265
211
        tree2.commit('unchanged', rev_id='b4')
266
212
        tree3.commit('unchanged', rev_id='c4')
267
213
 
268
214
        wt.merge_from_branch(tree3.branch)
269
 
        wt.merge_from_branch(tree2.branch, force=True)
 
215
        wt.merge_from_branch(tree2.branch)
270
216
        wt.commit('merge b4, c4', rev_id='a4')
271
217
 
272
218
        self.assertEqual(['a4'], wt.get_parent_ids())
273
219
 
274
220
        os.chdir('tree')
275
 
        out, err = self.run_bzr('uncommit --force -r 2')
276
 
 
277
 
        self.assertEqual(['a2', 'c4', 'b4'], wt.get_parent_ids())
278
 
 
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')
284
 
 
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())
291
 
 
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())
298
 
 
299
 
 
300
 
class TestSmartServerUncommit(TestCaseWithTransport):
301
 
 
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)
317
 
 
318
 
 
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'
324
 
 
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")
 
221
        out, err = self.run_bzr('uncommit', '--force', '-r', '2')
 
222
 
 
223
        self.assertEqual(['a2', 'b3', 'c3', 'c4', 'b4'], wt.get_parent_ids())