← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2011-09-25 01:56:48 UTC
  • mto: This revision was merged to the branch mainline in revision 779.
  • Revision ID: aaron@aaronbentley.com-20110925015648-41tbr3wonksf7efh
Add get_rev_info test.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
7
7
    UnshelveHunkSelector,
8
8
    )
9
9
from bzrlib.plugins.bzrtools.errors import NoColor
 
10
from bzrlib.plugins.bzrtools import command
 
11
from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1
10
12
 
11
13
 
12
14
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
31
33
+hello test world
32
34
 
33
35
"""
 
36
    def setUp(self):
 
37
        bzrlib.tests.TestCaseWithTransport.setUp(self)
 
38
        command._testing = True
 
39
        self.addCleanup(command._stop_testing)
 
40
 
34
41
    def _check_diff(self, diff=DIFF_1, filename='test_file'):
35
42
        old_tree = self.tree.basis_tree()
36
43
        old_tree.lock_read()
42
49
            new_date = _patch_header_date(self.tree,
43
50
                self.tree.inventory.path2id(filename), filename)
44
51
        finally:
 
52
            self.tree.unlock()
45
53
            old_tree.unlock()
46
 
        keys = { 'filename' : filename , 'old_date': old_date, 
 
54
        keys = { 'filename' : filename , 'old_date': old_date,
47
55
                 'new_date': new_date}
48
56
        hdr  = self.DIFF_HEADER % keys
49
57
        diff = diff % keys
50
 
        self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
 
58
        self.assertEqual(self.run_bzr('diff', retcode=1)[0], hdr + diff + '\n')
51
59
 
52
60
    def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
53
61
                     new_date=None):
75
83
    def __test_loop(self, count):
76
84
        self.tree = self.make_branch_and_tree('.')
77
85
        self.__create_and_add_test_file()
78
 
 
79
 
        while count > 0:
80
 
            count -= 1
81
 
 
 
86
        for counter in range(count):
82
87
            # Modify the test file
83
 
            # write in binary mode because on win32 line-endings should be LF
 
88
            # write in binary mode because on win32 line-endings should be
 
89
            # LF
84
90
            f = file('test_file', 'wb')
85
91
            f.write(self.MODIFIED)
86
92
            f.close()
87
93
 
88
94
            self._check_diff()
89
 
            
90
 
            new_date = _patch_header_date(self.tree, 
91
 
                self.tree.inventory.path2id('test_file'), 'test_file')
 
95
 
 
96
            self.tree.lock_write()
 
97
            try:
 
98
                new_date = _patch_header_date(self.tree,
 
99
                    self.tree.inventory.path2id('test_file'), 'test_file')
 
100
            finally:
 
101
                self.tree.unlock()
92
102
 
93
103
            # Shelve the changes
94
 
            self.run_bzr('shelve', '--all', retcode=0)
 
104
            self.run_bzr('shelve1 --all', retcode=0)
95
105
 
96
106
            # Make sure there is no diff anymore
97
 
            self.assertEqual(self.capture('diff', retcode=0), '')
 
107
            self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
98
108
 
99
109
            # Make sure the file is actually back the way it was
100
110
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
102
112
            self._check_shelf('00', new_date=new_date)
103
113
 
104
114
            # Unshelve
105
 
            self.run_bzr('unshelve', '--all', retcode=0)
 
115
            self.run_bzr('unshelve1 --all', retcode=0)
106
116
 
107
117
            self._check_diff()
108
118
 
118
128
        self.__create_and_add_test_file()
119
129
 
120
130
        # Shelve the changes
121
 
        self.run_bzr('shelve', '--all', retcode=3)
 
131
        self.run_bzr('shelve1 --all', retcode=3)
122
132
 
123
133
        if os.path.exists(os.path.join(self.tree.branch.base,
124
134
                '.shelf/shelves/default/00')):
142
152
        self.tree.commit(message='update test_file')
143
153
 
144
154
        # Shelve the changes
145
 
        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
 
155
        self.run_bzr('shelve1 --all -r 1', retcode=0)
146
156
 
147
157
        self._check_diff(self.DIFF_2)
148
158
 
150
160
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
151
161
 
152
162
        # Unshelve
153
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
163
        self.run_bzr('unshelve1 --all', retcode=0)
154
164
 
155
165
        # Make sure the file is back the way it should be
156
166
        self.assertEqual(file('test_file').read(), self.MODIFIED)
158
168
    def test_shelf_with_two_revisions(self):
159
169
        self.tree = self.make_branch_and_tree('.')
160
170
 
161
 
        cmd = 'shelve --all -r 1..2'
162
 
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
 
171
        stdout, stderr = self.run_bzr('shelve1 --all -r 1..2', retcode=None)
163
172
 
164
173
        self.assertEqual(stderr.split('\n')[0],
165
174
            'bzr: ERROR: shelve only accepts a single revision parameter.')
174
183
        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
175
184
 
176
185
        # Shelve the changes
177
 
        self.run_bzr('shelve', '--all', retcode=0)
 
186
        self.run_bzr('shelve1 --all', retcode=0)
178
187
 
179
188
        # Make sure there is no diff anymore
180
 
        self.assertEqual(self.capture('diff', retcode=0), '')
 
189
        self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
181
190
 
182
191
        # Check the shelf is right
183
192
        shelf = open(os.path.join(self.tree.basedir,
185
194
        self.assertTrue('patch %s' % patch in shelf)
186
195
 
187
196
        # Check the shown output is right
188
 
        shown = self.capture('shelf show %s' % patch, retcode=0)
 
197
        shown = self.run_bzr('shelf1 show %s' % patch, retcode=0)[0]
189
198
        self.assertEqual(shown, shelf)
190
199
 
191
200
    def test_shelf_show_multi(self):
201
210
        self.assertTrue('patch 00' in shelf)
202
211
 
203
212
        # Check the shown output is right
204
 
        shown = self.capture('shelf show 00', retcode=0)
 
213
        shown = self.run_bzr('shelf1 show 00', retcode=0)[0]
205
214
        self.assertEqual(shown, shelf)
206
215
 
207
216
    def test_shelf_show_unspecified(self):
217
226
        self.assertTrue('patch 02' in shelf)
218
227
 
219
228
        # Check the shown output is right
220
 
        shown = self.capture('shelf show', retcode=0)
 
229
        shown = self.run_bzr('shelf1 show', retcode=0)[0]
221
230
        self.assertEqual(shown, shelf)
222
231
 
223
232
    def test_shelf_show_with_no_patch(self):
224
233
        self.tree = self.make_branch_and_tree('.')
225
 
        stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
 
234
        stderr = self.run_bzr('shelf1 show 00', retcode=None)[1]
226
235
        self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
227
236
 
228
237
    def test_shelf_unshelve_failure(self):
234
243
        file('test_file', 'w').write(self.MODIFIED)
235
244
 
236
245
        # Shelve the changes
237
 
        self.run_bzr('shelve', '--all', retcode=0)
 
246
        self.run_bzr('shelve1 --all', retcode=0)
238
247
 
239
248
        # Write an unapplyable patch into the shelf
240
249
        shelf = open(os.path.join(self.tree.basedir,
243
252
        shelf.close()
244
253
 
245
254
        # Unshelve, should fail
246
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
255
        self.run_bzr('unshelve1 --all', retcode=3)
247
256
 
248
257
        # Make sure the patch is still there, eventhough it's broken
249
258
        shelf = open(os.path.join(self.tree.basedir,
251
260
        self.assertEqual(shelf, self.DIFF_2)
252
261
 
253
262
        # Working tree should be unchanged
254
 
        diff = self.capture('diff', retcode=0)
 
263
        diff = self.run_bzr('diff', retcode=0)[0]
255
264
        self.assertEqual(diff, '')
256
265
 
257
266
    def test_shelf_unshelve_failure_two_hunks(self):
265
274
        file('test_file2', 'w').write(self.MODIFIED)
266
275
 
267
276
        # Shelve the changes
268
 
        self.run_bzr('shelve', '--all', retcode=0)
 
277
        self.run_bzr('shelve1 --all', retcode=0)
269
278
 
270
279
        # Put the changes to test_file back, the shelved patch won't apply now
271
280
        file('test_file', 'w').write(self.MODIFIED)
272
281
        self.tree.commit(message='screw up test_file')
273
282
 
274
283
        # Unshelve, should fail
275
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
284
        self.run_bzr('unshelve1 --all', retcode=3)
276
285
 
277
286
        # Working tree should be unchanged
278
 
        diff = self.capture('diff', retcode=0)
 
287
        diff = self.run_bzr('diff', retcode=0)[0]
279
288
        self.assertEqual(diff, '')
280
289
 
281
290
        # Force should succeed and modify test_file2, but leave shelf
282
 
        self.run_bzr('unshelve', '--force', '--all', retcode=0)
 
291
        self.run_bzr('unshelve1 --force --all', retcode=0)
283
292
        self.assertEqual(open('test_file2').read(), self.MODIFIED)
284
293
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
285
294
 
294
303
        file('test_file2', 'w').write(self.MODIFIED)
295
304
 
296
305
        # Shelve the changes
297
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
298
 
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
306
        self.run_bzr('shelve1 --all test_file', retcode=0)
 
307
        self.run_bzr('shelve1 --all test_file2', retcode=0)
299
308
 
300
309
        # Unshelve
301
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
310
        self.run_bzr('unshelve1 --all', retcode=0)
302
311
 
303
312
        # We should now have 00 and 01~
304
313
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
305
314
        self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
306
315
 
307
316
        # Check ls works
308
 
        lines = self.capture('shelf ls', retcode=0).split('\n')
 
317
        lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
309
318
        for line in lines:
310
319
            self.assertFalse(line.startswith(' 01'))
311
320
 
312
321
        # Unshelve, if unshelve is confused by the backup it will fail
313
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
322
        self.run_bzr('unshelve1 --all', retcode=0)
314
323
 
315
324
    def test_shelf_delete(self):
316
325
        self.tree = self.make_branch_and_tree('.')
333
342
            self.tree.unlock()
334
343
 
335
344
        # Shelve the changes
336
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
337
 
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
345
        self.run_bzr('shelve1 --all test_file', retcode=0)
 
346
        self.run_bzr('shelve1 --all test_file2', retcode=0)
338
347
 
339
348
        self._check_shelf('00', new_date=new_date)
340
349
 
341
350
        # Delete 00
342
 
        self.run_bzr('shelf', 'delete', '00', retcode=0)
 
351
        self.run_bzr('shelf1 delete 00', retcode=0)
343
352
 
344
353
        # We should now have 01 but not 00, but we should have 00~
345
354
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
350
359
        self._check_shelf('00~', new_date=new_date)
351
360
 
352
361
        # Check ls works
353
 
        lines = self.capture('shelf ls', retcode=0).split('\n')
 
362
        lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
354
363
        for line in lines:
355
364
            self.assertFalse(line.startswith(' 00'))
356
365
 
357
366
        # Unshelve should unshelve 01
358
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
367
        self.run_bzr('unshelve1 --all', retcode=0)
359
368
        self.assertEqual(file('test_file2').read(), self.MODIFIED)
360
369
 
361
370
    def test_shelf_gaps(self):
362
371
        self.tree = self.make_branch_and_tree('.')
363
372
        self.__create_and_add_test_file()
364
373
        file('test_file', 'w').write(self.MODIFIED)
365
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
374
        self.run_bzr('shelve1 --all test_file', retcode=0)
366
375
        file('test_file', 'w').write(self.MODIFIED)
367
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
376
        self.run_bzr('shelve1 --all test_file', retcode=0)
368
377
 
369
378
        # Now delete 00, leaving 01, next shelve should go into 02
370
 
        self.run_bzr('shelf', 'delete', '0', retcode=0)
 
379
        self.run_bzr('shelf1 delete 0', retcode=0)
371
380
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
372
381
        self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
373
382
        file('test_file', 'w').write(self.MODIFIED)
374
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
383
        self.run_bzr('shelve1 --all test_file', retcode=0)
375
384
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
376
385
        self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
377
386
 
382
391
 
383
392
        # Modify then shelve, so we're not upgrading to 00, just for kicks
384
393
        file('test_file', 'w').write(self.MODIFIED)
385
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
394
        self.run_bzr('shelve1 --all test_file', retcode=0)
386
395
 
387
396
        open('.bzr-shelf', 'w').write('First old shelf')
388
397
        open('.bzr-shelf-1', 'w').write('Second old shelf')
390
399
 
391
400
        # shelve and unshelve should bitch and do nothing
392
401
        file('test_file', 'w').write('blah blah blah')
393
 
        self.run_bzr('shelve', '--all', retcode=3)
 
402
        self.run_bzr('shelve1 --all', retcode=3)
394
403
        self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
395
404
        self.assertEqual(file('test_file').read(), 'blah blah blah')
396
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
405
        self.run_bzr('unshelve1 --all', retcode=3)
397
406
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
398
407
 
399
408
        # Upgrade, make sure it worked
400
 
        self.run_bzr('shelf', 'upgrade', retcode=0)
 
409
        self.run_bzr('shelf1 upgrade', retcode=0)
401
410
        self.assertEqual(open('.shelf/shelves/default/01').read(),
402
411
                'First old shelf')
403
412
        self.assertEqual(open('.shelf/shelves/default/02').read(),
414
423
        self.assertFalse(os.path.exists('.bzr-shelf-3'))
415
424
 
416
425
        # Shelve should work now
417
 
        self.run_bzr('shelve', '--all', retcode=0)
 
426
        self.run_bzr('shelve1 --all', retcode=0)
418
427
 
419
428
    def test_shelf_p1_patch(self):
420
429
        self.tree = self.make_branch_and_tree('.')
422
431
        self.__create_and_add_test_file()
423
432
 
424
433
        # Run a benign shelf command to setup .shelf for us
425
 
        self.run_bzr('shelf', 'ls', retcode=0)
 
434
        self.run_bzr('shelf1 ls', retcode=0)
426
435
 
427
436
        old_tree = self.tree.basis_tree()
428
437
        old_tree.lock_read()
444
453
        open('.shelf/shelves/default/00', 'w').write(diff)
445
454
 
446
455
        # This should work
447
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
456
        self.run_bzr('unshelve1 --all', retcode=0)
448
457
 
449
458
        self._check_diff()
450
459
 
465
474
        f.close()
466
475
 
467
476
        # Shelve the changes
468
 
        self.run_bzr('shelve', '--all', retcode=0)
 
477
        self.run_bzr('shelve1 --all', retcode=0)
469
478
 
470
479
        # Working tree should be unchanged
471
 
        diff = self.capture('diff', retcode=0)
 
480
        diff = self.run_bzr('diff', retcode=0)[0]
472
481
        self.assertEqual(diff, '')
473
482
 
474
483
        # Unshelve, should succeed
475
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
484
        self.run_bzr('unshelve1 --all', retcode=0)
476
485
 
477
486
        self._check_diff(filename='subdir/test_file')
478
487
 
479
488
        # Make sure relative filenames work ok
480
 
        self.run_bzr('shelve', 'test_file', '--all', retcode=0)
 
489
        self.run_bzr('shelve1 test_file --all', retcode=0)
481
490
 
482
491
    def test_shelf_shelf_bogus_subcommand(self):
483
492
        self.tree = self.make_branch_and_tree('.')
484
 
        self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
 
493
        self.run_bzr('shelf1 foo', retcode=3) # <- retcode == 3
485
494
 
486
495
    def test_shelf_OOO_unshelve(self):
487
496
        self.tree = self.make_branch_and_tree('.')
495
504
 
496
505
        # Shelve the changes
497
506
        for i in range(1, 5):
498
 
            self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)
 
507
            self.run_bzr(['shelve1', '--all', 'test_file%d' % i], retcode=0)
499
508
 
500
509
        # Check shelving worked
501
510
        for i in range(1, 5):
506
515
            self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
507
516
 
508
517
        # Unshelve 00
509
 
        self.run_bzr('unshelve', '--all', '00', retcode=0)
 
518
        self.run_bzr('unshelve1 --all 00', retcode=0)
510
519
        self.assertEqual(file('test_file1').read(), self.MODIFIED)
511
520
 
512
521
        # Check ls works
513
 
        lines = self.capture('shelf ls', retcode=0).split('\n')
 
522
        lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
514
523
        for line in lines:
515
524
            self.assertFalse(line.startswith(' 00'))
516
525
 
517
526
        # Check we can reshelve once we've unshelved out of order, should be 04
518
527
        self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
519
 
        self.run_bzr('shelve', '--all')
 
528
        self.run_bzr('shelve1 --all')
520
529
        self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
521
530
 
522
531
        # Check ls works
523
 
        text = self.capture('shelf ls', retcode=0)
 
532
        text = self.run_bzr('shelf1 ls', retcode=0)[0]
524
533
        for line in text.split('\n'):
525
534
            self.assertFalse(line.startswith(' 00'))
526
535
 
527
536
        # We now have 01,02,03,04
528
537
        # Unshelve 02
529
 
        self.run_bzr('unshelve', '--all', '02', retcode=0)
 
538
        self.run_bzr('unshelve1 --all 02', retcode=0)
530
539
        self.assertEqual(file('test_file3').read(), self.MODIFIED)
531
540
 
532
541
        # Unshelve the default, this is the reshelved 00, hence modifies file 1
533
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
542
        self.run_bzr('unshelve1 --all', retcode=0)
534
543
        self.assertEqual(file('test_file1').read(), self.MODIFIED)
535
544
 
536
545
    def test_shelf_switch_basic(self):
539
548
 
540
549
        # This should go to "default"
541
550
        file('test_file', 'w').write(self.MODIFIED)
542
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
551
        self.run_bzr('shelve1 --all test_file', retcode=0)
543
552
 
544
553
        # Switch to "other"
545
 
        self.run_bzr('shelf', 'switch', 'other', retcode=0)
 
554
        self.run_bzr('shelf1 switch other', retcode=0)
546
555
        file('test_file', 'w').write(self.MODIFIED)
547
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
556
        self.run_bzr('shelve1 --all test_file', retcode=0)
548
557
 
549
558
        # Check it worked
550
559
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
552
561
        self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
553
562
 
554
563
        # Switch back
555
 
        self.run_bzr('shelf', 'switch', 'default', retcode=0)
 
564
        self.run_bzr('shelf1 switch default', retcode=0)
556
565
        file('test_file', 'w').write(self.MODIFIED)
557
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
566
        self.run_bzr('shelve1 --all test_file', retcode=0)
558
567
 
559
568
        # Check that worked
560
569
        self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
561
570
        self.assertFalse(os.path.exists('.shelf/shelves/other/01'))
562
571
 
 
572
    def test_shelf_binary(self):
 
573
        self.tree = self.make_branch_and_tree('.')
 
574
        self.build_tree_contents([('file', '\x00')])
 
575
        self.tree.add('file')
 
576
        self.run_bzr_error(['Changes involve binary files.'], 'shelve1 --all')
 
577
 
563
578
    def test_shelf_bad_patch_arg(self):
564
579
        self.tree = self.make_branch_and_tree('.')
565
580
 
566
581
        # Check the bad arg handling
567
 
        stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
 
582
        stdout, error = self.run_bzr('unshelve1 01', retcode=3)
568
583
        self.assertTrue("Patch '01' doesn't exist on shelf" in error)
569
584
 
570
 
        stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
 
585
        stdout, error = self.run_bzr('unshelve1 foo', retcode=3)
571
586
        self.assertTrue("Invalid patch name 'foo'" in error)
572
587
 
573
588
        # Hex and is cracky, so it shouldn't work
574
 
        stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
 
589
        stdout, error = self.run_bzr(['unshelve1', '0x00'], retcode=3)
575
590
        self.assertTrue("Invalid patch name '0x00'" in error)
576
591
 
577
592
    def test_color_hunk_selector(self):
609
624
        f = file('test_file', 'wb')
610
625
        f.write(self.MODIFIED)
611
626
        f.close()
612
 
        stdout, error = self.run_bzr_captured(['shelve', '--all', 
613
 
                                               '--no-color'])
614
 
        stdout, error = self.run_bzr_captured(['unshelve', '--all', 
615
 
                                               '--no-color'])
 
627
        stdout, error = self.run_bzr('shelve1 --all --no-color')
 
628
        stdout, error = self.run_bzr('unshelve1 --all --no-color')
 
629
 
 
630
    def test_shelf_help(self):
 
631
        self.assertContainsRe(cmd_shelf1().help(),
 
632
                              'list\n.*List the patches on the current shelf')
 
633
 
 
634
    def test_show_empty_shelf(self):
 
635
        self.tree = self.make_branch_and_tree('.')
 
636
        self.run_bzr_error(('No patches on shelf.',), 'shelf1 show')