2
from bzrlib.diff import _patch_header_date
5
from bzrlib.plugins.bzrtools.hunk_selector import (
9
from bzrlib.plugins.bzrtools.errors import NoColor
12
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
13
ORIGINAL = '\n\nhello test world\n\n'
14
MODIFIED = '\n\ngoodbye test world\n\n'
15
DIFF_HEADER = "=== modified file '%(filename)s'\n"
16
DIFF_1 = """--- %(filename)s\t%(old_date)s
17
+++ %(filename)s\t%(new_date)s
25
DIFF_2 = """--- test_file\t%(old_date)s
26
+++ test_file\t%(new_date)s
34
def _check_diff(self, diff=DIFF_1, filename='test_file'):
35
old_tree = self.tree.basis_tree()
39
old_date = _patch_header_date(old_tree,
40
old_tree.inventory.path2id(filename),
42
new_date = _patch_header_date(self.tree,
43
self.tree.inventory.path2id(filename), filename)
46
keys = { 'filename' : filename , 'old_date': old_date,
48
hdr = self.DIFF_HEADER % keys
50
self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
52
def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
54
old_tree = self.tree.basis_tree()
57
old_date = _patch_header_date(old_tree,
58
old_tree.inventory.path2id(filename),
62
diff = diff % { 'filename' : filename, 'old_date': old_date,
64
shelf = open(os.path.join(self.tree.basedir,
65
'.shelf/shelves/default/' + idx)).read()
66
shelf = shelf[shelf.index('\n') + 1:] # skip the message
67
self.assertEqual(shelf, diff)
72
def test_shelf_multi(self):
75
def __test_loop(self, count):
76
self.tree = self.make_branch_and_tree('.')
77
self.__create_and_add_test_file()
82
# Modify the test file
83
# write in binary mode because on win32 line-endings should be LF
84
f = file('test_file', 'wb')
85
f.write(self.MODIFIED)
90
new_date = _patch_header_date(self.tree,
91
self.tree.inventory.path2id('test_file'), 'test_file')
94
self.run_bzr('shelve', '--all', retcode=0)
96
# Make sure there is no diff anymore
97
self.assertEqual(self.capture('diff', retcode=0), '')
99
# Make sure the file is actually back the way it was
100
self.assertEqual(file('test_file').read(), self.ORIGINAL)
102
self._check_shelf('00', new_date=new_date)
105
self.run_bzr('unshelve', '--all', retcode=0)
109
# Check the shelved patch was backed up
110
self._check_shelf('00~', new_date=new_date)
112
# Make sure the file is back the way it should be
113
self.assertEqual(file('test_file').read(), self.MODIFIED)
115
def test_shelf_nothing_to_shelve(self):
117
self.tree = self.make_branch_and_tree('.')
118
self.__create_and_add_test_file()
121
self.run_bzr('shelve', '--all', retcode=3)
123
if os.path.exists(os.path.join(self.tree.branch.base,
124
'.shelf/shelves/default/00')):
125
self.fail("Shelf exists, but it shouldn't")
127
def __create_and_add_test_file(self, filename='test_file'):
128
# write in binary mode because on win32 line-endings should be LF
129
f = open(filename, 'wb')
130
f.write(self.ORIGINAL)
132
self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))
133
self.tree.commit(message='add %s' % filename)
135
def test_shelf_with_revision(self):
136
self.tree = self.make_branch_and_tree('.')
138
self.__create_and_add_test_file()
140
# Modify the test file and commit it
141
self.build_tree_contents([('test_file', self.MODIFIED)])
142
self.tree.commit(message='update test_file')
145
self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
147
self._check_diff(self.DIFF_2)
149
# Make sure the file is the way it should be
150
self.assertEqual(file('test_file').read(), self.ORIGINAL)
153
self.run_bzr('unshelve', '--all', retcode=0)
155
# Make sure the file is back the way it should be
156
self.assertEqual(file('test_file').read(), self.MODIFIED)
158
def test_shelf_with_two_revisions(self):
159
self.tree = self.make_branch_and_tree('.')
161
cmd = 'shelve --all -r 1..2'
162
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
164
self.assertEqual(stderr.split('\n')[0],
165
'bzr: ERROR: shelve only accepts a single revision parameter.')
167
def test_shelf_show_basic(self):
168
self.tree = self.make_branch_and_tree('.')
169
self.__create_and_add_test_file()
170
self.__test_show(self.tree, '00')
172
def __test_show(self, tree, patch):
173
# Modify the test file
174
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
177
self.run_bzr('shelve', '--all', retcode=0)
179
# Make sure there is no diff anymore
180
self.assertEqual(self.capture('diff', retcode=0), '')
182
# Check the shelf is right
183
shelf = open(os.path.join(self.tree.basedir,
184
'.shelf/shelves/default', patch)).read()
185
self.assertTrue('patch %s' % patch in shelf)
187
# Check the shown output is right
188
shown = self.capture('shelf show %s' % patch, retcode=0)
189
self.assertEqual(shown, shelf)
191
def test_shelf_show_multi(self):
192
self.tree = self.make_branch_and_tree('.')
193
self.__create_and_add_test_file()
194
self.__test_show(self.tree, '00')
195
self.__test_show(self.tree, '01')
196
self.__test_show(self.tree, '02')
198
# Now check we can show a previously shelved patch
199
shelf = open(os.path.join(self.tree.basedir,
200
'.shelf/shelves/default/00')).read()
201
self.assertTrue('patch 00' in shelf)
203
# Check the shown output is right
204
shown = self.capture('shelf show 00', retcode=0)
205
self.assertEqual(shown, shelf)
207
def test_shelf_show_unspecified(self):
208
self.tree = self.make_branch_and_tree('.')
209
self.__create_and_add_test_file()
210
self.__test_show(self.tree, '00')
211
self.__test_show(self.tree, '01')
212
self.__test_show(self.tree, '02')
214
# Check that not specifying at patch gets us the most recent
215
shelf = open(os.path.join(self.tree.basedir,
216
'.shelf/shelves/default/02')).read()
217
self.assertTrue('patch 02' in shelf)
219
# Check the shown output is right
220
shown = self.capture('shelf show', retcode=0)
221
self.assertEqual(shown, shelf)
223
def test_shelf_show_with_no_patch(self):
224
self.tree = self.make_branch_and_tree('.')
225
stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
226
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
228
def test_shelf_unshelve_failure(self):
229
self.tree = self.make_branch_and_tree('.')
231
self.__create_and_add_test_file()
233
# Modify the test file
234
file('test_file', 'w').write(self.MODIFIED)
237
self.run_bzr('shelve', '--all', retcode=0)
239
# Write an unapplyable patch into the shelf
240
shelf = open(os.path.join(self.tree.basedir,
241
'.shelf/shelves/default/00'), 'w')
242
shelf.write(self.DIFF_2)
245
# Unshelve, should fail
246
self.run_bzr('unshelve', '--all', retcode=3)
248
# Make sure the patch is still there, eventhough it's broken
249
shelf = open(os.path.join(self.tree.basedir,
250
'.shelf/shelves/default/00')).read()
251
self.assertEqual(shelf, self.DIFF_2)
253
# Working tree should be unchanged
254
diff = self.capture('diff', retcode=0)
255
self.assertEqual(diff, '')
257
def test_shelf_unshelve_failure_two_hunks(self):
258
self.tree = self.make_branch_and_tree('.')
260
self.__create_and_add_test_file()
261
self.__create_and_add_test_file(filename='test_file2')
263
# Modify the test files
264
file('test_file', 'w').write(self.MODIFIED)
265
file('test_file2', 'w').write(self.MODIFIED)
268
self.run_bzr('shelve', '--all', retcode=0)
270
# Put the changes to test_file back, the shelved patch won't apply now
271
file('test_file', 'w').write(self.MODIFIED)
272
self.tree.commit(message='screw up test_file')
274
# Unshelve, should fail
275
self.run_bzr('unshelve', '--all', retcode=3)
277
# Working tree should be unchanged
278
diff = self.capture('diff', retcode=0)
279
self.assertEqual(diff, '')
281
# Force should succeed and modify test_file2, but leave shelf
282
self.run_bzr('unshelve', '--force', '--all', retcode=0)
283
self.assertEqual(open('test_file2').read(), self.MODIFIED)
284
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
286
def test_shelf_after_unshelve(self):
287
self.tree = self.make_branch_and_tree('.')
289
self.__create_and_add_test_file()
290
self.__create_and_add_test_file(filename='test_file2')
292
# Modify the test files
293
file('test_file', 'w').write(self.MODIFIED)
294
file('test_file2', 'w').write(self.MODIFIED)
297
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
298
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
301
self.run_bzr('unshelve', '--all', retcode=0)
303
# We should now have 00 and 01~
304
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
305
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
308
lines = self.capture('shelf ls', retcode=0).split('\n')
310
self.assertFalse(line.startswith(' 01'))
312
# Unshelve, if unshelve is confused by the backup it will fail
313
self.run_bzr('unshelve', '--all', retcode=0)
315
def test_shelf_delete(self):
316
self.tree = self.make_branch_and_tree('.')
317
self.tree.lock_write()
319
self.__create_and_add_test_file()
320
self.__create_and_add_test_file(filename='test_file2')
322
# Modify the test files
323
# write in binary mode because on win32 line-endings should be LF
324
f = file('test_file', 'wb')
325
f.write(self.MODIFIED)
327
f = file('test_file2', 'wb')
328
f.write(self.MODIFIED)
330
new_date = _patch_header_date(self.tree,
331
self.tree.inventory.path2id('test_file'), 'test_file')
336
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
337
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
339
self._check_shelf('00', new_date=new_date)
342
self.run_bzr('shelf', 'delete', '00', retcode=0)
344
# We should now have 01 but not 00, but we should have 00~
345
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
346
self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
347
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
349
# Check the backup is right
350
self._check_shelf('00~', new_date=new_date)
353
lines = self.capture('shelf ls', retcode=0).split('\n')
355
self.assertFalse(line.startswith(' 00'))
357
# Unshelve should unshelve 01
358
self.run_bzr('unshelve', '--all', retcode=0)
359
self.assertEqual(file('test_file2').read(), self.MODIFIED)
361
def test_shelf_gaps(self):
362
self.tree = self.make_branch_and_tree('.')
363
self.__create_and_add_test_file()
364
file('test_file', 'w').write(self.MODIFIED)
365
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
366
file('test_file', 'w').write(self.MODIFIED)
367
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
369
# Now delete 00, leaving 01, next shelve should go into 02
370
self.run_bzr('shelf', 'delete', '0', retcode=0)
371
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
372
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
373
file('test_file', 'w').write(self.MODIFIED)
374
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
375
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
376
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
378
def test_shelf_upgrade(self):
379
self.tree = self.make_branch_and_tree('.')
381
self.__create_and_add_test_file()
383
# Modify then shelve, so we're not upgrading to 00, just for kicks
384
file('test_file', 'w').write(self.MODIFIED)
385
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
387
open('.bzr-shelf', 'w').write('First old shelf')
388
open('.bzr-shelf-1', 'w').write('Second old shelf')
389
open('.bzr-shelf-3', 'w').write('Fourth old shelf')
391
# shelve and unshelve should bitch and do nothing
392
file('test_file', 'w').write('blah blah blah')
393
self.run_bzr('shelve', '--all', retcode=3)
394
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
395
self.assertEqual(file('test_file').read(), 'blah blah blah')
396
self.run_bzr('unshelve', '--all', retcode=3)
397
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
399
# Upgrade, make sure it worked
400
self.run_bzr('shelf', 'upgrade', retcode=0)
401
self.assertEqual(open('.shelf/shelves/default/01').read(),
403
self.assertEqual(open('.shelf/shelves/default/02').read(),
405
self.assertEqual(open('.shelf/shelves/default/03').read(),
408
# Check the old shelves got backed up right
409
self.assertTrue(os.path.exists('.bzr-shelf~'))
410
self.assertTrue(os.path.exists('.bzr-shelf-1~'))
411
self.assertTrue(os.path.exists('.bzr-shelf-3~'))
412
self.assertFalse(os.path.exists('.bzr-shelf'))
413
self.assertFalse(os.path.exists('.bzr-shelf-1'))
414
self.assertFalse(os.path.exists('.bzr-shelf-3'))
416
# Shelve should work now
417
self.run_bzr('shelve', '--all', retcode=0)
419
def test_shelf_p1_patch(self):
420
self.tree = self.make_branch_and_tree('.')
422
self.__create_and_add_test_file()
424
# Run a benign shelf command to setup .shelf for us
425
self.run_bzr('shelf', 'ls', retcode=0)
427
old_tree = self.tree.basis_tree()
429
self.tree.lock_read()
431
old_date = _patch_header_date(old_tree,
432
old_tree.inventory.path2id('test_file'),
434
new_date = _patch_header_date(self.tree,
435
self.tree.inventory.path2id('test_file'), 'test_file')
439
# Fake a -p0 shelved patch
440
diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
441
'new_date' : new_date}
442
diff = diff.replace('--- ', '--- a/')
443
diff = diff.replace('+++ ', '+++ b/')
444
open('.shelf/shelves/default/00', 'w').write(diff)
447
self.run_bzr('unshelve', '--all', retcode=0)
451
def test_shelf_shelve_in_subdir(self):
452
self.tree = self.make_branch_and_tree('.')
456
self.tree.add(subdir)
459
self.__create_and_add_test_file()
461
# Modify the test file
462
# write in binary mode because on win32 line-endings should be LF
463
f = file('test_file', 'wb')
464
f.write(self.MODIFIED)
468
self.run_bzr('shelve', '--all', retcode=0)
470
# Working tree should be unchanged
471
diff = self.capture('diff', retcode=0)
472
self.assertEqual(diff, '')
474
# Unshelve, should succeed
475
self.run_bzr('unshelve', '--all', retcode=0)
477
self._check_diff(filename='subdir/test_file')
479
# Make sure relative filenames work ok
480
self.run_bzr('shelve', 'test_file', '--all', retcode=0)
482
def test_shelf_shelf_bogus_subcommand(self):
483
self.tree = self.make_branch_and_tree('.')
484
self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
486
def test_shelf_OOO_unshelve(self):
487
self.tree = self.make_branch_and_tree('.')
489
for i in range(1, 5):
490
self.__create_and_add_test_file(filename='test_file%d' % i)
492
# Modify the test files
493
for i in range(1, 5):
494
file('test_file%d' % i, 'w').write(self.MODIFIED)
497
for i in range(1, 5):
498
self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)
500
# Check shelving worked
501
for i in range(1, 5):
502
self.assertEqual(file('test_file%d' % i).read(), self.ORIGINAL)
504
# We should now have 00-03
505
for i in range(0, 4):
506
self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
509
self.run_bzr('unshelve', '--all', '00', retcode=0)
510
self.assertEqual(file('test_file1').read(), self.MODIFIED)
513
lines = self.capture('shelf ls', retcode=0).split('\n')
515
self.assertFalse(line.startswith(' 00'))
517
# Check we can reshelve once we've unshelved out of order, should be 04
518
self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
519
self.run_bzr('shelve', '--all')
520
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
523
text = self.capture('shelf ls', retcode=0)
524
for line in text.split('\n'):
525
self.assertFalse(line.startswith(' 00'))
527
# We now have 01,02,03,04
529
self.run_bzr('unshelve', '--all', '02', retcode=0)
530
self.assertEqual(file('test_file3').read(), self.MODIFIED)
532
# Unshelve the default, this is the reshelved 00, hence modifies file 1
533
self.run_bzr('unshelve', '--all', retcode=0)
534
self.assertEqual(file('test_file1').read(), self.MODIFIED)
536
def test_shelf_switch_basic(self):
537
self.tree = self.make_branch_and_tree('.')
538
self.__create_and_add_test_file()
540
# This should go to "default"
541
file('test_file', 'w').write(self.MODIFIED)
542
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
545
self.run_bzr('shelf', 'switch', 'other', retcode=0)
546
file('test_file', 'w').write(self.MODIFIED)
547
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
550
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
551
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
552
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
555
self.run_bzr('shelf', 'switch', 'default', retcode=0)
556
file('test_file', 'w').write(self.MODIFIED)
557
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
560
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
561
self.assertFalse(os.path.exists('.shelf/shelves/other/01'))
563
def test_shelf_bad_patch_arg(self):
564
self.tree = self.make_branch_and_tree('.')
566
# Check the bad arg handling
567
stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
568
self.assertTrue("Patch '01' doesn't exist on shelf" in error)
570
stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
571
self.assertTrue("Invalid patch name 'foo'" in error)
573
# Hex and is cracky, so it shouldn't work
574
stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
575
self.assertTrue("Invalid patch name '0x00'" in error)
577
def test_color_hunk_selector(self):
578
"""Make sure NoColor is raised iff terminal.has_ansi_colors is False"""
579
hs = ShelveHunkSelector([])
580
hs = UnshelveHunkSelector([])
582
from bzrlib.plugins.bzrtools import terminal
584
from bzrtools import terminal
585
old_has_ansi_colors = terminal.has_ansi_colors
586
terminal.has_ansi_colors = lambda: False
588
self.assertRaises(NoColor, ShelveHunkSelector, [], True)
589
self.assertRaises(NoColor, UnshelveHunkSelector, [], True)
590
terminal.has_ansi_colors = lambda: True
591
hs = ShelveHunkSelector([], color=True)
592
hs = UnshelveHunkSelector([], color=True)
594
terminal.has_ansi_colors = old_has_ansi_colors
596
def test_no_color(self):
597
"""Ensure --no-color switch can be passed"""
598
self.tree = self.make_branch_and_tree('.')
602
self.tree.add(subdir)
605
self.__create_and_add_test_file()
607
# Modify the test file
608
# write in binary mode because on win32 line-endings should be LF
609
f = file('test_file', 'wb')
610
f.write(self.MODIFIED)
612
stdout, error = self.run_bzr_captured(['shelve', '--all',
614
stdout, error = self.run_bzr_captured(['unshelve', '--all',
added
removed
tests/shelf_tests.py
