← 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: 2013-08-20 03:02:43 UTC
  • Revision ID: aaron@aaronbentley.com-20130820030243-r8v1xfbcnd8f10p4
Fix zap command for 2.6/7

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