37
bzrlib.tests.TestCaseWithTransport.setUp(self)
38
command._testing = True
39
self.addCleanup(command._stop_testing)
41
33
def _check_diff(self, diff=DIFF_1, filename='test_file'):
42
34
old_tree = self.tree.basis_tree()
46
old_date = _patch_header_date(old_tree,
47
old_tree.path2id(filename),
49
new_date = _patch_header_date(self.tree,
50
self.tree.path2id(filename), filename)
54
keys = { 'filename' : filename , 'old_date': old_date,
35
old_date = _patch_header_date(old_tree,
36
old_tree.inventory.path2id(filename),
38
new_date = _patch_header_date(self.tree,
39
self.tree.inventory.path2id(filename),
41
keys = { 'filename' : filename , 'old_date': old_date,
55
42
'new_date': new_date}
56
43
hdr = self.DIFF_HEADER % keys
58
self.assertEqual(self.run_bzr('diff', retcode=1)[0], hdr + diff + '\n')
45
self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
60
47
def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
62
49
old_tree = self.tree.basis_tree()
65
old_date = _patch_header_date(old_tree,
66
old_tree.path2id(filename),
50
old_date = _patch_header_date(old_tree,
51
old_tree.inventory.path2id(filename),
70
53
diff = diff % { 'filename' : filename, 'old_date': old_date,
71
54
'new_date': new_date}
72
55
shelf = open(os.path.join(self.tree.basedir,
83
66
def __test_loop(self, count):
84
67
self.tree = self.make_branch_and_tree('.')
85
68
self.__create_and_add_test_file()
86
for counter in range(count):
87
73
# Modify the test file
88
# write in binary mode because on win32 line-endings should be
74
# write in binary mode because on win32 line-endings should be LF
90
75
f = file('test_file', 'wb')
91
76
f.write(self.MODIFIED)
96
self.tree.lock_write()
98
new_date = _patch_header_date(self.tree,
99
self.tree.path2id('test_file'), 'test_file')
81
new_date = _patch_header_date(self.tree,
82
self.tree.inventory.path2id('test_file'), 'test_file')
103
84
# Shelve the changes
104
self.run_bzr('shelve1 --all', retcode=0)
85
self.run_bzr('shelve', '--all', retcode=0)
106
87
# Make sure there is no diff anymore
107
self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
88
self.assertEqual(self.capture('diff', retcode=0), '')
109
90
# Make sure the file is actually back the way it was
110
91
self.assertEqual(file('test_file').read(), self.ORIGINAL)
168
149
def test_shelf_with_two_revisions(self):
169
150
self.tree = self.make_branch_and_tree('.')
171
stdout, stderr = self.run_bzr('shelve1 --all -r 1..2', retcode=None)
152
cmd = 'shelve --all -r 1..2'
153
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
173
155
self.assertEqual(stderr.split('\n')[0],
174
156
'bzr: ERROR: shelve only accepts a single revision parameter.')
183
165
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
185
167
# Shelve the changes
186
self.run_bzr('shelve1 --all', retcode=0)
168
self.run_bzr('shelve', '--all', retcode=0)
188
170
# Make sure there is no diff anymore
189
self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
171
self.assertEqual(self.capture('diff', retcode=0), '')
191
173
# Check the shelf is right
192
174
shelf = open(os.path.join(self.tree.basedir,
226
208
self.assertTrue('patch 02' in shelf)
228
210
# Check the shown output is right
229
shown = self.run_bzr('shelf1 show', retcode=0)[0]
211
shown = self.capture('shelf show', retcode=0)
230
212
self.assertEqual(shown, shelf)
232
214
def test_shelf_show_with_no_patch(self):
233
215
self.tree = self.make_branch_and_tree('.')
234
stderr = self.run_bzr('shelf1 show 00', retcode=None)[1]
216
stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
235
217
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
237
219
def test_shelf_unshelve_failure(self):
274
256
file('test_file2', 'w').write(self.MODIFIED)
276
258
# Shelve the changes
277
self.run_bzr('shelve1 --all', retcode=0)
259
self.run_bzr('shelve', '--all', retcode=0)
279
261
# Put the changes to test_file back, the shelved patch won't apply now
280
262
file('test_file', 'w').write(self.MODIFIED)
281
263
self.tree.commit(message='screw up test_file')
283
265
# Unshelve, should fail
284
self.run_bzr('unshelve1 --all', retcode=3)
266
self.run_bzr('unshelve', '--all', retcode=3)
286
268
# Working tree should be unchanged
287
diff = self.run_bzr('diff', retcode=0)[0]
269
diff = self.capture('diff', retcode=0)
288
270
self.assertEqual(diff, '')
290
272
# Force should succeed and modify test_file2, but leave shelf
291
self.run_bzr('unshelve1 --force --all', retcode=0)
273
self.run_bzr('unshelve', '--force', '--all', retcode=0)
292
274
self.assertEqual(open('test_file2').read(), self.MODIFIED)
293
275
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
303
285
file('test_file2', 'w').write(self.MODIFIED)
305
287
# Shelve the changes
306
self.run_bzr('shelve1 --all test_file', retcode=0)
307
self.run_bzr('shelve1 --all test_file2', retcode=0)
288
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
289
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
310
self.run_bzr('unshelve1 --all', retcode=0)
292
self.run_bzr('unshelve', '--all', retcode=0)
312
294
# We should now have 00 and 01~
313
295
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
314
296
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
317
lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
299
lines = self.capture('shelf ls', retcode=0).split('\n')
318
300
for line in lines:
319
301
self.assertFalse(line.startswith(' 01'))
321
303
# Unshelve, if unshelve is confused by the backup it will fail
322
self.run_bzr('unshelve1 --all', retcode=0)
304
self.run_bzr('unshelve', '--all', retcode=0)
324
306
def test_shelf_delete(self):
325
307
self.tree = self.make_branch_and_tree('.')
326
self.tree.lock_write()
328
self.__create_and_add_test_file()
329
self.__create_and_add_test_file(filename='test_file2')
331
# Modify the test files
332
# write in binary mode because on win32 line-endings should be LF
333
f = file('test_file', 'wb')
334
f.write(self.MODIFIED)
336
f = file('test_file2', 'wb')
337
f.write(self.MODIFIED)
339
new_date = _patch_header_date(self.tree,
340
self.tree.path2id('test_file'), 'test_file')
309
self.__create_and_add_test_file()
310
self.__create_and_add_test_file(filename='test_file2')
312
# Modify the test files
313
# write in binary mode because on win32 line-endings should be LF
314
f = file('test_file', 'wb')
315
f.write(self.MODIFIED)
317
f = file('test_file2', 'wb')
318
f.write(self.MODIFIED)
320
new_date = _patch_header_date(self.tree,
321
self.tree.inventory.path2id('test_file'), 'test_file')
344
323
# Shelve the changes
345
self.run_bzr('shelve1 --all test_file', retcode=0)
346
self.run_bzr('shelve1 --all test_file2', retcode=0)
324
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
325
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
348
327
self._check_shelf('00', new_date=new_date)
351
self.run_bzr('shelf1 delete 00', retcode=0)
330
self.run_bzr('shelf', 'delete', '00', retcode=0)
353
332
# We should now have 01 but not 00, but we should have 00~
354
333
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
359
338
self._check_shelf('00~', new_date=new_date)
362
lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
341
lines = self.capture('shelf ls', retcode=0).split('\n')
363
342
for line in lines:
364
343
self.assertFalse(line.startswith(' 00'))
366
345
# Unshelve should unshelve 01
367
self.run_bzr('unshelve1 --all', retcode=0)
346
self.run_bzr('unshelve', '--all', retcode=0)
368
347
self.assertEqual(file('test_file2').read(), self.MODIFIED)
370
349
def test_shelf_gaps(self):
371
350
self.tree = self.make_branch_and_tree('.')
372
351
self.__create_and_add_test_file()
373
352
file('test_file', 'w').write(self.MODIFIED)
374
self.run_bzr('shelve1 --all test_file', retcode=0)
353
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
375
354
file('test_file', 'w').write(self.MODIFIED)
376
self.run_bzr('shelve1 --all test_file', retcode=0)
355
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
378
357
# Now delete 00, leaving 01, next shelve should go into 02
379
self.run_bzr('shelf1 delete 0', retcode=0)
358
self.run_bzr('shelf', 'delete', '0', retcode=0)
380
359
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
381
360
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
382
361
file('test_file', 'w').write(self.MODIFIED)
383
self.run_bzr('shelve1 --all test_file', retcode=0)
362
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
384
363
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
385
364
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
392
371
# Modify then shelve, so we're not upgrading to 00, just for kicks
393
372
file('test_file', 'w').write(self.MODIFIED)
394
self.run_bzr('shelve1 --all test_file', retcode=0)
373
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
396
375
open('.bzr-shelf', 'w').write('First old shelf')
397
376
open('.bzr-shelf-1', 'w').write('Second old shelf')
400
379
# shelve and unshelve should bitch and do nothing
401
380
file('test_file', 'w').write('blah blah blah')
402
self.run_bzr('shelve1 --all', retcode=3)
381
self.run_bzr('shelve', '--all', retcode=3)
403
382
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
404
383
self.assertEqual(file('test_file').read(), 'blah blah blah')
405
self.run_bzr('unshelve1 --all', retcode=3)
384
self.run_bzr('unshelve', '--all', retcode=3)
406
385
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
408
387
# Upgrade, make sure it worked
409
self.run_bzr('shelf1 upgrade', retcode=0)
388
self.run_bzr('shelf', 'upgrade', retcode=0)
410
389
self.assertEqual(open('.shelf/shelves/default/01').read(),
411
390
'First old shelf')
412
391
self.assertEqual(open('.shelf/shelves/default/02').read(),
431
410
self.__create_and_add_test_file()
433
412
# Run a benign shelf command to setup .shelf for us
434
self.run_bzr('shelf1 ls', retcode=0)
413
self.run_bzr('shelf', 'ls', retcode=0)
436
415
old_tree = self.tree.basis_tree()
438
self.tree.lock_read()
440
old_date = _patch_header_date(old_tree,
441
old_tree.path2id('test_file'),
443
new_date = _patch_header_date(self.tree,
444
self.tree.path2id('test_file'), 'test_file')
416
old_date = _patch_header_date(old_tree,
417
old_tree.inventory.path2id('test_file'),
419
new_date = _patch_header_date(self.tree,
420
self.tree.inventory.path2id('test_file'),
448
422
# Fake a -p0 shelved patch
449
423
diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
450
424
'new_date' : new_date}
476
450
# Shelve the changes
477
self.run_bzr('shelve1 --all', retcode=0)
451
self.run_bzr('shelve', '--all', retcode=0)
479
453
# Working tree should be unchanged
480
diff = self.run_bzr('diff', retcode=0)[0]
454
diff = self.capture('diff', retcode=0)
481
455
self.assertEqual(diff, '')
483
457
# Unshelve, should succeed
484
self.run_bzr('unshelve1 --all', retcode=0)
458
self.run_bzr('unshelve', '--all', retcode=0)
486
460
self._check_diff(filename='subdir/test_file')
488
462
# Make sure relative filenames work ok
489
self.run_bzr('shelve1 test_file --all', retcode=0)
463
self.run_bzr('shelve', 'test_file', '--all', retcode=0)
491
465
def test_shelf_shelf_bogus_subcommand(self):
492
466
self.tree = self.make_branch_and_tree('.')
493
self.run_bzr('shelf1 foo', retcode=3) # <- retcode == 3
467
self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
495
469
def test_shelf_OOO_unshelve(self):
496
470
self.tree = self.make_branch_and_tree('.')
515
489
self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
518
self.run_bzr('unshelve1 --all 00', retcode=0)
492
self.run_bzr('unshelve', '--all', '00', retcode=0)
519
493
self.assertEqual(file('test_file1').read(), self.MODIFIED)
522
lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
496
lines = self.capture('shelf ls', retcode=0).split('\n')
523
497
for line in lines:
524
498
self.assertFalse(line.startswith(' 00'))
526
500
# Check we can reshelve once we've unshelved out of order, should be 04
527
501
self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
528
self.run_bzr('shelve1 --all')
502
self.run_bzr('shelve', '--all')
529
503
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
532
text = self.run_bzr('shelf1 ls', retcode=0)[0]
506
text = self.capture('shelf ls', retcode=0)
533
507
for line in text.split('\n'):
534
508
self.assertFalse(line.startswith(' 00'))
536
510
# We now have 01,02,03,04
538
self.run_bzr('unshelve1 --all 02', retcode=0)
512
self.run_bzr('unshelve', '--all', '02', retcode=0)
539
513
self.assertEqual(file('test_file3').read(), self.MODIFIED)
541
515
# Unshelve the default, this is the reshelved 00, hence modifies file 1
542
self.run_bzr('unshelve1 --all', retcode=0)
516
self.run_bzr('unshelve', '--all', retcode=0)
543
517
self.assertEqual(file('test_file1').read(), self.MODIFIED)
545
519
def test_shelf_switch_basic(self):
549
523
# This should go to "default"
550
524
file('test_file', 'w').write(self.MODIFIED)
551
self.run_bzr('shelve1 --all test_file', retcode=0)
525
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
553
527
# Switch to "other"
554
self.run_bzr('shelf1 switch other', retcode=0)
528
self.run_bzr('shelf', 'switch', 'other', retcode=0)
555
529
file('test_file', 'w').write(self.MODIFIED)
556
self.run_bzr('shelve1 --all test_file', retcode=0)
530
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
558
532
# Check it worked
559
533
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
561
535
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
564
self.run_bzr('shelf1 switch default', retcode=0)
538
self.run_bzr('shelf', 'switch', 'default', retcode=0)
565
539
file('test_file', 'w').write(self.MODIFIED)
566
self.run_bzr('shelve1 --all test_file', retcode=0)
540
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
568
542
# Check that worked
569
543
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
570
544
self.assertFalse(os.path.exists('.shelf/shelves/other/01'))
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')
578
546
def test_shelf_bad_patch_arg(self):
579
547
self.tree = self.make_branch_and_tree('.')
581
549
# Check the bad arg handling
582
stdout, error = self.run_bzr('unshelve1 01', retcode=3)
550
stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
583
551
self.assertTrue("Patch '01' doesn't exist on shelf" in error)
585
stdout, error = self.run_bzr('unshelve1 foo', retcode=3)
553
stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
586
554
self.assertTrue("Invalid patch name 'foo'" in error)
588
556
# Hex and is cracky, so it shouldn't work
589
stdout, error = self.run_bzr(['unshelve1', '0x00'], retcode=3)
557
stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
590
558
self.assertTrue("Invalid patch name '0x00'" in error)
592
560
def test_color_hunk_selector(self):
593
561
"""Make sure NoColor is raised iff terminal.has_ansi_colors is False"""
594
562
hs = ShelveHunkSelector([])
595
563
hs = UnshelveHunkSelector([])
597
from bzrlib.plugins.bzrtools import terminal
599
from bzrtools import terminal
564
from bzrlib.plugins.bzrtools import terminal
600
565
old_has_ansi_colors = terminal.has_ansi_colors
601
566
terminal.has_ansi_colors = lambda: False
624
589
f = file('test_file', 'wb')
625
590
f.write(self.MODIFIED)
627
stdout, error = self.run_bzr('shelve1 --all --no-color')
628
stdout, error = self.run_bzr('unshelve1 --all --no-color')
630
def test_shelf_help(self):
631
self.assertContainsRe(cmd_shelf1().help(),
632
'list\n.*List the patches on the current shelf')
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')
592
stdout, error = self.run_bzr_captured(['shelve', '--all',
594
stdout, error = self.run_bzr_captured(['unshelve', '--all',