/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/test_shelf_ui.py

  • Committer: Martin Pool
  • Date: 2008-11-17 03:21:53 UTC
  • mto: This revision was merged to the branch mainline in revision 3844.
  • Revision ID: mbp@sourcefrog.net-20081117032153-5al4ibc256whf5ut
Remove dead exports

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf_ui.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 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
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
 
18
18
from cStringIO import StringIO
19
19
import os
20
 
import sys
21
 
from textwrap import dedent
22
20
 
23
 
from bzrlib import (
24
 
    errors,
25
 
    shelf_ui,
26
 
    revision,
27
 
    tests,
28
 
)
29
 
from bzrlib.tests import script
 
21
from bzrlib import errors, shelf_ui, tests
30
22
 
31
23
 
32
24
class ExpectShelver(shelf_ui.Shelver):
33
25
    """A variant of Shelver that intercepts console activity, for testing."""
34
26
 
35
 
    def __init__(self, work_tree, target_tree, diff_writer=None,
36
 
                 auto=False, auto_apply=False, file_list=None, message=None,
37
 
                 destroy=False, reporter=None):
38
 
        shelf_ui.Shelver.__init__(self, work_tree, target_tree, diff_writer,
39
 
                                  auto, auto_apply, file_list, message,
40
 
                                  destroy, reporter=reporter)
 
27
    def __init__(self, work_tree, target_tree, path=None, auto=False,
 
28
                 auto_apply=False, file_list=None, message=None):
 
29
        shelf_ui.Shelver.__init__(self, work_tree, target_tree, auto,
 
30
                                  auto_apply, file_list, message)
41
31
        self.expected = []
42
32
        self.diff_writer = StringIO()
43
33
 
75
65
 
76
66
    def test_unexpected_prompt_failure(self):
77
67
        tree = self.create_shelvable_tree()
78
 
        tree.lock_tree_write()
79
 
        self.addCleanup(tree.unlock)
80
68
        shelver = ExpectShelver(tree, tree.basis_tree())
81
 
        self.addCleanup(shelver.finalize)
82
69
        e = self.assertRaises(AssertionError, shelver.run)
83
 
        self.assertEqual('Unexpected prompt: Shelve? [yNfq?]', str(e))
 
70
        self.assertEqual('Unexpected prompt: Shelve? [yNfq]', str(e))
84
71
 
85
72
    def test_wrong_prompt_failure(self):
86
73
        tree = self.create_shelvable_tree()
87
 
        tree.lock_tree_write()
88
 
        self.addCleanup(tree.unlock)
89
74
        shelver = ExpectShelver(tree, tree.basis_tree())
90
 
        self.addCleanup(shelver.finalize)
91
75
        shelver.expect('foo', 'y')
92
76
        e = self.assertRaises(AssertionError, shelver.run)
93
 
        self.assertEqual('Wrong prompt: Shelve? [yNfq?]', str(e))
 
77
        self.assertEqual('Wrong prompt: Shelve? [yNfq]', str(e))
94
78
 
95
79
    def test_shelve_not_diff(self):
96
80
        tree = self.create_shelvable_tree()
97
 
        tree.lock_tree_write()
98
 
        self.addCleanup(tree.unlock)
99
81
        shelver = ExpectShelver(tree, tree.basis_tree())
100
 
        self.addCleanup(shelver.finalize)
101
 
        shelver.expect('Shelve? [yNfq?]', 'n')
102
 
        shelver.expect('Shelve? [yNfq?]', 'n')
 
82
        shelver.expect('Shelve? [yNfq]', 'n')
 
83
        shelver.expect('Shelve? [yNfq]', 'n')
103
84
        # No final shelving prompt because no changes were selected
104
85
        shelver.run()
105
86
        self.assertFileEqual(LINES_ZY, 'tree/foo')
106
87
 
107
88
    def test_shelve_diff_no(self):
108
89
        tree = self.create_shelvable_tree()
109
 
        tree.lock_tree_write()
110
 
        self.addCleanup(tree.unlock)
111
90
        shelver = ExpectShelver(tree, tree.basis_tree())
112
 
        self.addCleanup(shelver.finalize)
113
 
        shelver.expect('Shelve? [yNfq?]', 'y')
114
 
        shelver.expect('Shelve? [yNfq?]', 'y')
115
 
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'n')
 
91
        shelver.expect('Shelve? [yNfq]', 'y')
 
92
        shelver.expect('Shelve? [yNfq]', 'y')
 
93
        shelver.expect('Shelve 2 change(s)? [yNfq]', 'n')
116
94
        shelver.run()
117
95
        self.assertFileEqual(LINES_ZY, 'tree/foo')
118
96
 
119
97
    def test_shelve_diff(self):
120
98
        tree = self.create_shelvable_tree()
121
 
        tree.lock_tree_write()
122
 
        self.addCleanup(tree.unlock)
123
99
        shelver = ExpectShelver(tree, tree.basis_tree())
124
 
        self.addCleanup(shelver.finalize)
125
 
        shelver.expect('Shelve? [yNfq?]', 'y')
126
 
        shelver.expect('Shelve? [yNfq?]', 'y')
127
 
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
 
100
        shelver.expect('Shelve? [yNfq]', 'y')
 
101
        shelver.expect('Shelve? [yNfq]', 'y')
 
102
        shelver.expect('Shelve 2 change(s)? [yNfq]', 'y')
128
103
        shelver.run()
129
104
        self.assertFileEqual(LINES_AJ, 'tree/foo')
130
105
 
131
106
    def test_shelve_one_diff(self):
132
107
        tree = self.create_shelvable_tree()
133
 
        tree.lock_tree_write()
134
 
        self.addCleanup(tree.unlock)
135
108
        shelver = ExpectShelver(tree, tree.basis_tree())
136
 
        self.addCleanup(shelver.finalize)
137
 
        shelver.expect('Shelve? [yNfq?]', 'y')
138
 
        shelver.expect('Shelve? [yNfq?]', 'n')
139
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
109
        shelver.expect('Shelve? [yNfq]', 'y')
 
110
        shelver.expect('Shelve? [yNfq]', 'n')
 
111
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
140
112
        shelver.run()
141
113
        self.assertFileEqual(LINES_AY, 'tree/foo')
142
114
 
143
115
    def test_shelve_binary_change(self):
144
116
        tree = self.create_shelvable_tree()
145
117
        self.build_tree_contents([('tree/foo', '\x00')])
146
 
        tree.lock_tree_write()
147
 
        self.addCleanup(tree.unlock)
148
118
        shelver = ExpectShelver(tree, tree.basis_tree())
149
 
        self.addCleanup(shelver.finalize)
150
 
        shelver.expect('Shelve binary changes? [yNfq?]', 'y')
151
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
119
        shelver.expect('Shelve binary changes? [yNfq]', 'y')
 
120
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
152
121
        shelver.run()
153
122
        self.assertFileEqual(LINES_AJ, 'tree/foo')
154
123
 
155
124
    def test_shelve_rename(self):
156
125
        tree = self.create_shelvable_tree()
157
126
        tree.rename_one('foo', 'bar')
158
 
        tree.lock_tree_write()
159
 
        self.addCleanup(tree.unlock)
160
127
        shelver = ExpectShelver(tree, tree.basis_tree())
161
 
        self.addCleanup(shelver.finalize)
162
 
        shelver.expect('Shelve renaming "foo" => "bar"? [yNfq?]', 'y')
163
 
        shelver.expect('Shelve? [yNfq?]', 'y')
164
 
        shelver.expect('Shelve? [yNfq?]', 'y')
165
 
        shelver.expect('Shelve 3 change(s)? [yNfq?]', 'y')
 
128
        shelver.expect('Shelve renaming "foo" => "bar"? [yNfq]', 'y')
 
129
        shelver.expect('Shelve? [yNfq]', 'y')
 
130
        shelver.expect('Shelve? [yNfq]', 'y')
 
131
        shelver.expect('Shelve 3 change(s)? [yNfq]', 'y')
166
132
        shelver.run()
167
133
        self.assertFileEqual(LINES_AJ, 'tree/foo')
168
134
 
169
135
    def test_shelve_deletion(self):
170
136
        tree = self.create_shelvable_tree()
171
137
        os.unlink('tree/foo')
172
 
        tree.lock_tree_write()
173
 
        self.addCleanup(tree.unlock)
174
138
        shelver = ExpectShelver(tree, tree.basis_tree())
175
 
        self.addCleanup(shelver.finalize)
176
 
        shelver.expect('Shelve removing file "foo"? [yNfq?]', 'y')
177
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
139
        shelver.expect('Shelve removing file "foo"? [yNfq]', 'y')
 
140
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
178
141
        shelver.run()
179
142
        self.assertFileEqual(LINES_AJ, 'tree/foo')
180
143
 
183
146
        tree.commit('add tree root')
184
147
        self.build_tree(['tree/foo'])
185
148
        tree.add('foo')
186
 
        tree.lock_tree_write()
187
 
        self.addCleanup(tree.unlock)
188
149
        shelver = ExpectShelver(tree, tree.basis_tree())
189
 
        self.addCleanup(shelver.finalize)
190
 
        shelver.expect('Shelve adding file "foo"? [yNfq?]', 'y')
191
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
 
150
        shelver.expect('Shelve adding file "foo"? [yNfq]', 'y')
 
151
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
192
152
        shelver.run()
193
153
        self.failIfExists('tree/foo')
194
154
 
196
156
        tree = self.create_shelvable_tree()
197
157
        os.unlink('tree/foo')
198
158
        os.mkdir('tree/foo')
199
 
        tree.lock_tree_write()
200
 
        self.addCleanup(tree.unlock)
201
159
        shelver = ExpectShelver(tree, tree.basis_tree())
202
 
        self.addCleanup(shelver.finalize)
203
 
        shelver.expect('Shelve changing "foo" from file to directory? [yNfq?]',
 
160
        shelver.expect('Shelve changing "foo" from file to directory? [yNfq]',
204
161
                       'y')
205
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
206
 
 
207
 
    def test_shelve_modify_target(self):
208
 
        self.requireFeature(tests.SymlinkFeature)
209
 
        tree = self.create_shelvable_tree()
210
 
        os.symlink('bar', 'tree/baz')
211
 
        tree.add('baz', 'baz-id')
212
 
        tree.commit("Add symlink")
213
 
        os.unlink('tree/baz')
214
 
        os.symlink('vax', 'tree/baz')
215
 
        tree.lock_tree_write()
216
 
        self.addCleanup(tree.unlock)
217
 
        shelver = ExpectShelver(tree, tree.basis_tree())
218
 
        self.addCleanup(shelver.finalize)
219
 
        shelver.expect('Shelve changing target of "baz" from "bar" to '
220
 
                '"vax"? [yNfq?]', 'y')
221
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
222
 
        shelver.run()
223
 
        self.assertEqual('bar', os.readlink('tree/baz'))
 
162
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
224
163
 
225
164
    def test_shelve_finish(self):
226
165
        tree = self.create_shelvable_tree()
227
 
        tree.lock_tree_write()
228
 
        self.addCleanup(tree.unlock)
229
166
        shelver = ExpectShelver(tree, tree.basis_tree())
230
 
        self.addCleanup(shelver.finalize)
231
 
        shelver.expect('Shelve? [yNfq?]', 'f')
232
 
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
 
167
        shelver.expect('Shelve? [yNfq]', 'f')
 
168
        shelver.expect('Shelve 2 change(s)? [yNfq]', 'y')
233
169
        shelver.run()
234
170
        self.assertFileEqual(LINES_AJ, 'tree/foo')
235
171
 
236
172
    def test_shelve_quit(self):
237
173
        tree = self.create_shelvable_tree()
238
 
        tree.lock_tree_write()
239
 
        self.addCleanup(tree.unlock)
240
174
        shelver = ExpectShelver(tree, tree.basis_tree())
241
 
        self.addCleanup(shelver.finalize)
242
 
        shelver.expect('Shelve? [yNfq?]', 'q')
 
175
        shelver.expect('Shelve? [yNfq]', 'q')
243
176
        self.assertRaises(errors.UserAbort, shelver.run)
244
177
        self.assertFileEqual(LINES_ZY, 'tree/foo')
245
178
 
246
179
    def test_shelve_all(self):
247
180
        tree = self.create_shelvable_tree()
248
 
        shelver = ExpectShelver.from_args(sys.stdout, all=True,
249
 
            directory='tree')
250
 
        try:
251
 
            shelver.run()
252
 
        finally:
253
 
            shelver.finalize()
 
181
        ExpectShelver.from_args(all=True, directory='tree').run()
254
182
        self.assertFileEqual(LINES_AJ, 'tree/foo')
255
183
 
256
184
    def test_shelve_filename(self):
257
185
        tree = self.create_shelvable_tree()
258
186
        self.build_tree(['tree/bar'])
259
187
        tree.add('bar')
260
 
        tree.lock_tree_write()
261
 
        self.addCleanup(tree.unlock)
262
188
        shelver = ExpectShelver(tree, tree.basis_tree(), file_list=['bar'])
263
 
        self.addCleanup(shelver.finalize)
264
 
        shelver.expect('Shelve adding file "bar"? [yNfq?]', 'y')
265
 
        shelver.expect('Shelve 1 change(s)? [yNfq?]', 'y')
266
 
        shelver.run()
267
 
 
268
 
    def test_shelve_help(self):
269
 
        tree = self.create_shelvable_tree()
270
 
        tree.lock_tree_write()
271
 
        self.addCleanup(tree.unlock)
272
 
        shelver = ExpectShelver(tree, tree.basis_tree())
273
 
        self.addCleanup(shelver.finalize)
274
 
        shelver.expect('Shelve? [yNfq?]', '?')
275
 
        shelver.expect('Shelve? [(y)es, (N)o, (f)inish, or (q)uit]', 'f')
276
 
        shelver.expect('Shelve 2 change(s)? [yNfq?]', 'y')
277
 
        shelver.run()
278
 
 
279
 
    def test_shelve_destroy(self):
280
 
        tree = self.create_shelvable_tree()
281
 
        shelver = shelf_ui.Shelver.from_args(sys.stdout, all=True,
282
 
                                             directory='tree', destroy=True)
283
 
        self.addCleanup(shelver.finalize)
284
 
        shelver.run()
285
 
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
286
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
287
 
 
288
 
    @staticmethod
289
 
    def shelve_all(tree, target_revision_id):
290
 
        tree.lock_write()
291
 
        try:
292
 
            target = tree.branch.repository.revision_tree(target_revision_id)
293
 
            shelver = shelf_ui.Shelver(tree, target, auto=True,
294
 
                                       auto_apply=True)
295
 
            try:
296
 
                shelver.run()
297
 
            finally:
298
 
                shelver.finalize()
299
 
        finally:
300
 
            tree.unlock()
301
 
 
302
 
    def test_shelve_old_root_deleted(self):
303
 
        tree1 = self.make_branch_and_tree('tree1')
304
 
        tree1.commit('add root')
305
 
        tree2 = self.make_branch_and_tree('tree2')
306
 
        rev2 = tree2.commit('add root')
307
 
        tree1.merge_from_branch(tree2.branch,
308
 
                                from_revision=revision.NULL_REVISION)
309
 
        tree1.commit('Replaced root entry')
310
 
        # This is essentially assertNotRaises(InconsistentDelta)
311
 
        self.expectFailure('Cannot shelve replacing a root entry',
312
 
                           self.assertRaises, AssertionError,
313
 
                           self.assertRaises, errors.InconsistentDelta,
314
 
                           self.shelve_all, tree1, rev2)
315
 
 
316
 
    def test_shelve_split(self):
317
 
        outer_tree = self.make_branch_and_tree('outer')
318
 
        outer_tree.commit('Add root')
319
 
        inner_tree = self.make_branch_and_tree('outer/inner')
320
 
        rev2 = inner_tree.commit('Add root')
321
 
        outer_tree.subsume(inner_tree)
322
 
        # This is essentially assertNotRaises(ValueError).
323
 
        # The ValueError is 'None is not a valid file id'.
324
 
        self.expectFailure('Cannot shelve a join back to the inner tree.',
325
 
                           self.assertRaises, AssertionError,
326
 
                           self.assertRaises, ValueError, self.shelve_all,
327
 
                           outer_tree, rev2)
328
 
 
329
 
 
330
 
class TestApplyReporter(TestShelver):
331
 
 
332
 
    def test_shelve_not_diff(self):
333
 
        tree = self.create_shelvable_tree()
334
 
        tree.lock_tree_write()
335
 
        self.addCleanup(tree.unlock)
336
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
337
 
                                reporter=shelf_ui.ApplyReporter())
338
 
        self.addCleanup(shelver.finalize)
339
 
        shelver.expect('Apply change? [yNfq?]', 'n')
340
 
        shelver.expect('Apply change? [yNfq?]', 'n')
341
 
        # No final shelving prompt because no changes were selected
342
 
        shelver.run()
343
 
        self.assertFileEqual(LINES_ZY, 'tree/foo')
344
 
 
345
 
    def test_shelve_diff_no(self):
346
 
        tree = self.create_shelvable_tree()
347
 
        tree.lock_tree_write()
348
 
        self.addCleanup(tree.unlock)
349
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
350
 
                                reporter=shelf_ui.ApplyReporter())
351
 
        self.addCleanup(shelver.finalize)
352
 
        shelver.expect('Apply change? [yNfq?]', 'y')
353
 
        shelver.expect('Apply change? [yNfq?]', 'y')
354
 
        shelver.expect('Apply 2 change(s)? [yNfq?]', 'n')
355
 
        shelver.run()
356
 
        self.assertFileEqual(LINES_ZY, 'tree/foo')
357
 
 
358
 
    def test_shelve_diff(self):
359
 
        tree = self.create_shelvable_tree()
360
 
        tree.lock_tree_write()
361
 
        self.addCleanup(tree.unlock)
362
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
363
 
                                reporter=shelf_ui.ApplyReporter())
364
 
        self.addCleanup(shelver.finalize)
365
 
        shelver.expect('Apply change? [yNfq?]', 'y')
366
 
        shelver.expect('Apply change? [yNfq?]', 'y')
367
 
        shelver.expect('Apply 2 change(s)? [yNfq?]', 'y')
368
 
        shelver.run()
369
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
370
 
 
371
 
    def test_shelve_binary_change(self):
372
 
        tree = self.create_shelvable_tree()
373
 
        self.build_tree_contents([('tree/foo', '\x00')])
374
 
        tree.lock_tree_write()
375
 
        self.addCleanup(tree.unlock)
376
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
377
 
                                reporter=shelf_ui.ApplyReporter())
378
 
        self.addCleanup(shelver.finalize)
379
 
        shelver.expect('Apply binary changes? [yNfq?]', 'y')
380
 
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
381
 
        shelver.run()
382
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
383
 
 
384
 
    def test_shelve_rename(self):
385
 
        tree = self.create_shelvable_tree()
386
 
        tree.rename_one('foo', 'bar')
387
 
        tree.lock_tree_write()
388
 
        self.addCleanup(tree.unlock)
389
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
390
 
                                reporter=shelf_ui.ApplyReporter())
391
 
        self.addCleanup(shelver.finalize)
392
 
        shelver.expect('Rename "bar" => "foo"? [yNfq?]', 'y')
393
 
        shelver.expect('Apply change? [yNfq?]', 'y')
394
 
        shelver.expect('Apply change? [yNfq?]', 'y')
395
 
        shelver.expect('Apply 3 change(s)? [yNfq?]', 'y')
396
 
        shelver.run()
397
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
398
 
 
399
 
    def test_shelve_deletion(self):
400
 
        tree = self.create_shelvable_tree()
401
 
        os.unlink('tree/foo')
402
 
        tree.lock_tree_write()
403
 
        self.addCleanup(tree.unlock)
404
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
405
 
                                reporter=shelf_ui.ApplyReporter())
406
 
        self.addCleanup(shelver.finalize)
407
 
        shelver.expect('Add file "foo"? [yNfq?]', 'y')
408
 
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
409
 
        shelver.run()
410
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
411
 
 
412
 
    def test_shelve_creation(self):
413
 
        tree = self.make_branch_and_tree('tree')
414
 
        tree.commit('add tree root')
415
 
        self.build_tree(['tree/foo'])
416
 
        tree.add('foo')
417
 
        tree.lock_tree_write()
418
 
        self.addCleanup(tree.unlock)
419
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
420
 
                                reporter=shelf_ui.ApplyReporter())
421
 
        self.addCleanup(shelver.finalize)
422
 
        shelver.expect('Delete file "foo"? [yNfq?]', 'y')
423
 
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
424
 
        shelver.run()
425
 
        self.failIfExists('tree/foo')
426
 
 
427
 
    def test_shelve_kind_change(self):
428
 
        tree = self.create_shelvable_tree()
429
 
        os.unlink('tree/foo')
430
 
        os.mkdir('tree/foo')
431
 
        tree.lock_tree_write()
432
 
        self.addCleanup(tree.unlock)
433
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
434
 
                               reporter=shelf_ui.ApplyReporter())
435
 
        self.addCleanup(shelver.finalize)
436
 
        shelver.expect('Change "foo" from directory to a file? [yNfq?]', 'y')
437
 
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
438
 
 
439
 
    def test_shelve_modify_target(self):
440
 
        self.requireFeature(tests.SymlinkFeature)
441
 
        tree = self.create_shelvable_tree()
442
 
        os.symlink('bar', 'tree/baz')
443
 
        tree.add('baz', 'baz-id')
444
 
        tree.commit("Add symlink")
445
 
        os.unlink('tree/baz')
446
 
        os.symlink('vax', 'tree/baz')
447
 
        tree.lock_tree_write()
448
 
        self.addCleanup(tree.unlock)
449
 
        shelver = ExpectShelver(tree, tree.basis_tree(),
450
 
                                reporter=shelf_ui.ApplyReporter())
451
 
        self.addCleanup(shelver.finalize)
452
 
        shelver.expect('Change target of "baz" from "vax" to "bar"? [yNfq?]',
453
 
                       'y')
454
 
        shelver.expect('Apply 1 change(s)? [yNfq?]', 'y')
455
 
        shelver.run()
456
 
        self.assertEqual('bar', os.readlink('tree/baz'))
 
189
        shelver.expect('Shelve adding file "bar"? [yNfq]', 'y')
 
190
        shelver.expect('Shelve 1 change(s)? [yNfq]', 'y')
 
191
        shelver.run()
457
192
 
458
193
 
459
194
class TestUnshelver(tests.TestCaseWithTransport):
460
195
 
461
196
    def create_tree_with_shelf(self):
462
197
        tree = self.make_branch_and_tree('tree')
463
 
        tree.lock_write()
464
 
        try:
465
 
            self.build_tree_contents([('tree/foo', LINES_AJ)])
466
 
            tree.add('foo', 'foo-id')
467
 
            tree.commit('added foo')
468
 
            self.build_tree_contents([('tree/foo', LINES_ZY)])
469
 
            shelver = shelf_ui.Shelver(tree, tree.basis_tree(),
470
 
                                       auto_apply=True, auto=True)
471
 
            try:
472
 
                shelver.run()
473
 
            finally:
474
 
                shelver.finalize()
475
 
        finally:
476
 
            tree.unlock()
 
198
        self.build_tree_contents([('tree/foo', LINES_AJ)])
 
199
        tree.add('foo', 'foo-id')
 
200
        tree.commit('added foo')
 
201
        self.build_tree_contents([('tree/foo', LINES_ZY)])
 
202
        shelf_ui.Shelver(tree, tree.basis_tree(), auto_apply=True,
 
203
                         auto=True).run()
477
204
        return tree
478
205
 
479
206
    def test_unshelve(self):
486
213
 
487
214
    def test_unshelve_args(self):
488
215
        tree = self.create_tree_with_shelf()
489
 
        unshelver = shelf_ui.Unshelver.from_args(directory='tree')
490
 
        try:
491
 
            unshelver.run()
492
 
        finally:
493
 
            unshelver.tree.unlock()
 
216
        shelf_ui.Unshelver.from_args(directory='tree').run()
494
217
        self.assertFileEqual(LINES_ZY, 'tree/foo')
495
218
        self.assertIs(None, tree.get_shelf_manager().last_shelf())
496
219
 
497
220
    def test_unshelve_args_dry_run(self):
498
221
        tree = self.create_tree_with_shelf()
499
 
        unshelver = shelf_ui.Unshelver.from_args(directory='tree',
500
 
            action='dry-run')
501
 
        try:
502
 
            unshelver.run()
503
 
        finally:
504
 
            unshelver.tree.unlock()
505
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
506
 
        self.assertEqual(1, tree.get_shelf_manager().last_shelf())
507
 
 
508
 
    def test_unshelve_args_preview(self):
509
 
        tree = self.create_tree_with_shelf()
510
 
        write_diff_to = StringIO()
511
 
        unshelver = shelf_ui.Unshelver.from_args(
512
 
            directory='tree', action='preview', write_diff_to=write_diff_to)
513
 
        try:
514
 
            unshelver.run()
515
 
        finally:
516
 
            unshelver.tree.unlock()
517
 
        # The changes were not unshelved.
518
 
        self.assertFileEqual(LINES_AJ, 'tree/foo')
519
 
        self.assertEqual(1, tree.get_shelf_manager().last_shelf())
520
 
 
521
 
        # But the diff was written to write_diff_to.
522
 
        diff = write_diff_to.getvalue()
523
 
        expected = dedent("""\
524
 
            @@ -1,4 +1,4 @@
525
 
            -a
526
 
            +z
527
 
             b
528
 
             c
529
 
             d
530
 
            @@ -7,4 +7,4 @@
531
 
             g
532
 
             h
533
 
             i
534
 
            -j
535
 
            +y
536
 
 
537
 
            """)
538
 
        self.assertEqualDiff(expected, diff[-len(expected):])
 
222
        shelf_ui.Unshelver.from_args(directory='tree', action='dry-run').run()
 
223
        self.assertFileEqual(LINES_AJ, 'tree/foo')
 
224
        self.assertEqual(1, tree.get_shelf_manager().last_shelf())
539
225
 
540
226
    def test_unshelve_args_delete_only(self):
541
227
        tree = self.make_branch_and_tree('tree')
547
233
            shelf_file.close()
548
234
        unshelver = shelf_ui.Unshelver.from_args(directory='tree',
549
235
                                                 action='delete-only')
550
 
        try:
551
 
            unshelver.run()
552
 
        finally:
553
 
            unshelver.tree.unlock()
 
236
        unshelver.run()
554
237
        self.assertIs(None, manager.last_shelf())
555
 
 
556
 
    def test_unshelve_args_invalid_shelf_id(self):
557
 
        tree = self.make_branch_and_tree('tree')
558
 
        manager = tree.get_shelf_manager()
559
 
        shelf_file = manager.new_shelf()[1]
560
 
        try:
561
 
            shelf_file.write('garbage')
562
 
        finally:
563
 
            shelf_file.close()
564
 
        self.assertRaises(errors.InvalidShelfId,
565
 
            shelf_ui.Unshelver.from_args, directory='tree',
566
 
            action='delete-only', shelf_id='foo')
567
 
 
568
 
 
569
 
class TestUnshelveScripts(TestUnshelver, 
570
 
                          script.TestCaseWithTransportAndScript): 
571
 
 
572
 
    def test_unshelve_messages_keep(self):
573
 
        self.create_tree_with_shelf()
574
 
        self.run_script("""
575
 
$ cd tree
576
 
$ bzr unshelve --keep
577
 
2>Using changes with id "1".
578
 
2> M  foo
579
 
2>All changes applied successfully.
580
 
""")
581
 
 
582
 
    def test_unshelve_messages_delete(self):
583
 
        self.create_tree_with_shelf()
584
 
        self.run_script("""
585
 
$ cd tree
586
 
$ bzr unshelve --delete-only
587
 
2>Deleted changes with id "1".
588
 
""")
589
 
 
590
 
    def test_unshelve_messages_apply(self):
591
 
        self.create_tree_with_shelf()
592
 
        self.run_script("""
593
 
$ cd tree
594
 
$ bzr unshelve --apply
595
 
2>Using changes with id "1".
596
 
2> M  foo
597
 
2>All changes applied successfully.
598
 
2>Deleted changes with id "1".
599
 
""")
600
 
 
601
 
    def test_unshelve_messages_dry_run(self):
602
 
        self.create_tree_with_shelf()
603
 
        self.run_script("""
604
 
$ cd tree
605
 
$ bzr unshelve --dry-run
606
 
2>Using changes with id "1".
607
 
2> M  foo
608
 
""")