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()
36
old_date = _patch_header_date(old_tree,
37
old_tree.inventory.path2id(filename),
39
new_date = _patch_header_date(self.tree,
40
self.tree.inventory.path2id(filename),
42
keys = { 'filename' : filename , 'old_date': old_date,
44
hdr = self.DIFF_HEADER % keys
46
self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
48
def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
50
old_tree = self.tree.basis_tree()
51
old_date = _patch_header_date(old_tree,
52
old_tree.inventory.path2id(filename),
54
diff = diff % { 'filename' : filename, 'old_date': old_date,
56
shelf = open(os.path.join(self.tree.basedir,
57
'.shelf/shelves/default/' + idx)).read()
58
shelf = shelf[shelf.index('\n') + 1:] # skip the message
59
self.assertEqual(shelf, diff)
64
def test_shelf_multi(self):
67
def __test_loop(self, count):
68
self.tree = self.make_branch_and_tree('.')
69
self.__create_and_add_test_file()
74
# Modify the test file
75
# write in binary mode because on win32 line-endings should be LF
76
f = file('test_file', 'wb')
77
f.write(self.MODIFIED)
82
new_date = _patch_header_date(self.tree,
83
self.tree.inventory.path2id('test_file'), 'test_file')
86
self.run_bzr('shelve', '--all', retcode=0)
88
# Make sure there is no diff anymore
89
self.assertEqual(self.capture('diff', retcode=0), '')
91
# Make sure the file is actually back the way it was
92
self.assertEqual(file('test_file').read(), self.ORIGINAL)
94
self._check_shelf('00', new_date=new_date)
97
self.run_bzr('unshelve', '--all', retcode=0)
101
# Check the shelved patch was backed up
102
self._check_shelf('00~', new_date=new_date)
104
# Make sure the file is back the way it should be
105
self.assertEqual(file('test_file').read(), self.MODIFIED)
107
def test_shelf_nothing_to_shelve(self):
109
self.tree = self.make_branch_and_tree('.')
110
self.__create_and_add_test_file()
113
self.run_bzr('shelve', '--all', retcode=3)
115
if os.path.exists(os.path.join(self.tree.branch.base,
116
'.shelf/shelves/default/00')):
117
self.fail("Shelf exists, but it shouldn't")
119
def __create_and_add_test_file(self, filename='test_file'):
120
# write in binary mode because on win32 line-endings should be LF
121
f = open(filename, 'wb')
122
f.write(self.ORIGINAL)
124
self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))
125
self.tree.commit(message='add %s' % filename)
127
def test_shelf_with_revision(self):
128
self.tree = self.make_branch_and_tree('.')
130
self.__create_and_add_test_file()
132
# Modify the test file and commit it
133
self.build_tree_contents([('test_file', self.MODIFIED)])
134
self.tree.commit(message='update test_file')
137
self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
139
self._check_diff(self.DIFF_2)
141
# Make sure the file is the way it should be
142
self.assertEqual(file('test_file').read(), self.ORIGINAL)
145
self.run_bzr('unshelve', '--all', retcode=0)
147
# Make sure the file is back the way it should be
148
self.assertEqual(file('test_file').read(), self.MODIFIED)
150
def test_shelf_with_two_revisions(self):
151
self.tree = self.make_branch_and_tree('.')
153
cmd = 'shelve --all -r 1..2'
154
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
156
self.assertEqual(stderr.split('\n')[0],
157
'bzr: ERROR: shelve only accepts a single revision parameter.')
159
def test_shelf_show_basic(self):
160
self.tree = self.make_branch_and_tree('.')
161
self.__create_and_add_test_file()
162
self.__test_show(self.tree, '00')
164
def __test_show(self, tree, patch):
165
# Modify the test file
166
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
169
self.run_bzr('shelve', '--all', retcode=0)
171
# Make sure there is no diff anymore
172
self.assertEqual(self.capture('diff', retcode=0), '')
174
# Check the shelf is right
175
shelf = open(os.path.join(self.tree.basedir,
176
'.shelf/shelves/default', patch)).read()
177
self.assertTrue('patch %s' % patch in shelf)
179
# Check the shown output is right
180
shown = self.capture('shelf show %s' % patch, retcode=0)
181
self.assertEqual(shown, shelf)
183
def test_shelf_show_multi(self):
184
self.tree = self.make_branch_and_tree('.')
185
self.__create_and_add_test_file()
186
self.__test_show(self.tree, '00')
187
self.__test_show(self.tree, '01')
188
self.__test_show(self.tree, '02')
190
# Now check we can show a previously shelved patch
191
shelf = open(os.path.join(self.tree.basedir,
192
'.shelf/shelves/default/00')).read()
193
self.assertTrue('patch 00' in shelf)
195
# Check the shown output is right
196
shown = self.capture('shelf show 00', retcode=0)
197
self.assertEqual(shown, shelf)
199
def test_shelf_show_unspecified(self):
200
self.tree = self.make_branch_and_tree('.')
201
self.__create_and_add_test_file()
202
self.__test_show(self.tree, '00')
203
self.__test_show(self.tree, '01')
204
self.__test_show(self.tree, '02')
206
# Check that not specifying at patch gets us the most recent
207
shelf = open(os.path.join(self.tree.basedir,
208
'.shelf/shelves/default/02')).read()
209
self.assertTrue('patch 02' in shelf)
211
# Check the shown output is right
212
shown = self.capture('shelf show', retcode=0)
213
self.assertEqual(shown, shelf)
215
def test_shelf_show_with_no_patch(self):
216
self.tree = self.make_branch_and_tree('.')
217
stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
218
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
220
def test_shelf_unshelve_failure(self):
221
self.tree = self.make_branch_and_tree('.')
223
self.__create_and_add_test_file()
225
# Modify the test file
226
file('test_file', 'w').write(self.MODIFIED)
229
self.run_bzr('shelve', '--all', retcode=0)
231
# Write an unapplyable patch into the shelf
232
shelf = open(os.path.join(self.tree.basedir,
233
'.shelf/shelves/default/00'), 'w')
234
shelf.write(self.DIFF_2)
237
# Unshelve, should fail
238
self.run_bzr('unshelve', '--all', retcode=3)
240
# Make sure the patch is still there, eventhough it's broken
241
shelf = open(os.path.join(self.tree.basedir,
242
'.shelf/shelves/default/00')).read()
243
self.assertEqual(shelf, self.DIFF_2)
245
# Working tree should be unchanged
246
diff = self.capture('diff', retcode=0)
247
self.assertEqual(diff, '')
249
def test_shelf_unshelve_failure_two_hunks(self):
250
self.tree = self.make_branch_and_tree('.')
252
self.__create_and_add_test_file()
253
self.__create_and_add_test_file(filename='test_file2')
255
# Modify the test files
256
file('test_file', 'w').write(self.MODIFIED)
257
file('test_file2', 'w').write(self.MODIFIED)
260
self.run_bzr('shelve', '--all', retcode=0)
262
# Put the changes to test_file back, the shelved patch won't apply now
263
file('test_file', 'w').write(self.MODIFIED)
264
self.tree.commit(message='screw up test_file')
266
# Unshelve, should fail
267
self.run_bzr('unshelve', '--all', retcode=3)
269
# Working tree should be unchanged
270
diff = self.capture('diff', retcode=0)
271
self.assertEqual(diff, '')
273
# Force should succeed and modify test_file2, but leave shelf
274
self.run_bzr('unshelve', '--force', '--all', retcode=0)
275
self.assertEqual(open('test_file2').read(), self.MODIFIED)
276
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
278
def test_shelf_after_unshelve(self):
279
self.tree = self.make_branch_and_tree('.')
281
self.__create_and_add_test_file()
282
self.__create_and_add_test_file(filename='test_file2')
284
# Modify the test files
285
file('test_file', 'w').write(self.MODIFIED)
286
file('test_file2', 'w').write(self.MODIFIED)
289
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
290
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
293
self.run_bzr('unshelve', '--all', retcode=0)
295
# We should now have 00 and 01~
296
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
297
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
300
lines = self.capture('shelf ls', retcode=0).split('\n')
302
self.assertFalse(line.startswith(' 01'))
304
# Unshelve, if unshelve is confused by the backup it will fail
305
self.run_bzr('unshelve', '--all', retcode=0)
307
def test_shelf_delete(self):
308
self.tree = self.make_branch_and_tree('.')
310
self.__create_and_add_test_file()
311
self.__create_and_add_test_file(filename='test_file2')
313
# Modify the test files
314
# write in binary mode because on win32 line-endings should be LF
315
f = file('test_file', 'wb')
316
f.write(self.MODIFIED)
318
f = file('test_file2', 'wb')
319
f.write(self.MODIFIED)
321
new_date = _patch_header_date(self.tree,
322
self.tree.inventory.path2id('test_file'), 'test_file')
325
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
326
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
328
self._check_shelf('00', new_date=new_date)
331
self.run_bzr('shelf', 'delete', '00', retcode=0)
333
# We should now have 01 but not 00, but we should have 00~
334
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
335
self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
336
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
338
# Check the backup is right
339
self._check_shelf('00~', new_date=new_date)
342
lines = self.capture('shelf ls', retcode=0).split('\n')
344
self.assertFalse(line.startswith(' 00'))
346
# Unshelve should unshelve 01
347
self.run_bzr('unshelve', '--all', retcode=0)
348
self.assertEqual(file('test_file2').read(), self.MODIFIED)
350
def test_shelf_gaps(self):
351
self.tree = self.make_branch_and_tree('.')
352
self.__create_and_add_test_file()
353
file('test_file', 'w').write(self.MODIFIED)
354
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
355
file('test_file', 'w').write(self.MODIFIED)
356
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
358
# Now delete 00, leaving 01, next shelve should go into 02
359
self.run_bzr('shelf', 'delete', '0', retcode=0)
360
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
361
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
362
file('test_file', 'w').write(self.MODIFIED)
363
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
364
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
365
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
367
def test_shelf_upgrade(self):
368
self.tree = self.make_branch_and_tree('.')
370
self.__create_and_add_test_file()
372
# Modify then shelve, so we're not upgrading to 00, just for kicks
373
file('test_file', 'w').write(self.MODIFIED)
374
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
376
open('.bzr-shelf', 'w').write('First old shelf')
377
open('.bzr-shelf-1', 'w').write('Second old shelf')
378
open('.bzr-shelf-3', 'w').write('Fourth old shelf')
380
# shelve and unshelve should bitch and do nothing
381
file('test_file', 'w').write('blah blah blah')
382
self.run_bzr('shelve', '--all', retcode=3)
383
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
384
self.assertEqual(file('test_file').read(), 'blah blah blah')
385
self.run_bzr('unshelve', '--all', retcode=3)
386
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
388
# Upgrade, make sure it worked
389
self.run_bzr('shelf', 'upgrade', retcode=0)
390
self.assertEqual(open('.shelf/shelves/default/01').read(),
392
self.assertEqual(open('.shelf/shelves/default/02').read(),
394
self.assertEqual(open('.shelf/shelves/default/03').read(),
397
# Check the old shelves got backed up right
398
self.assertTrue(os.path.exists('.bzr-shelf~'))
399
self.assertTrue(os.path.exists('.bzr-shelf-1~'))
400
self.assertTrue(os.path.exists('.bzr-shelf-3~'))
401
self.assertFalse(os.path.exists('.bzr-shelf'))
402
self.assertFalse(os.path.exists('.bzr-shelf-1'))
403
self.assertFalse(os.path.exists('.bzr-shelf-3'))
405
# Shelve should work now
406
self.run_bzr('shelve', '--all', retcode=0)
408
def test_shelf_p1_patch(self):
409
self.tree = self.make_branch_and_tree('.')
411
self.__create_and_add_test_file()
413
# Run a benign shelf command to setup .shelf for us
414
self.run_bzr('shelf', 'ls', retcode=0)
416
old_tree = self.tree.basis_tree()
417
old_date = _patch_header_date(old_tree,
418
old_tree.inventory.path2id('test_file'),
420
new_date = _patch_header_date(self.tree,
421
self.tree.inventory.path2id('test_file'),
423
# Fake a -p0 shelved patch
424
diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
425
'new_date' : new_date}
426
diff = diff.replace('--- ', '--- a/')
427
diff = diff.replace('+++ ', '+++ b/')
428
open('.shelf/shelves/default/00', 'w').write(diff)
431
self.run_bzr('unshelve', '--all', retcode=0)
435
def test_shelf_shelve_in_subdir(self):
436
self.tree = self.make_branch_and_tree('.')
440
self.tree.add(subdir)
443
self.__create_and_add_test_file()
445
# Modify the test file
446
# write in binary mode because on win32 line-endings should be LF
447
f = file('test_file', 'wb')
448
f.write(self.MODIFIED)
452
self.run_bzr('shelve', '--all', retcode=0)
454
# Working tree should be unchanged
455
diff = self.capture('diff', retcode=0)
456
self.assertEqual(diff, '')
458
# Unshelve, should succeed
459
self.run_bzr('unshelve', '--all', retcode=0)
461
self._check_diff(filename='subdir/test_file')
463
# Make sure relative filenames work ok
464
self.run_bzr('shelve', 'test_file', '--all', retcode=0)
466
def test_shelf_shelf_bogus_subcommand(self):
467
self.tree = self.make_branch_and_tree('.')
468
self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
470
def test_shelf_OOO_unshelve(self):
471
self.tree = self.make_branch_and_tree('.')
473
for i in range(1, 5):
474
self.__create_and_add_test_file(filename='test_file%d' % i)
476
# Modify the test files
477
for i in range(1, 5):
478
file('test_file%d' % i, 'w').write(self.MODIFIED)
481
for i in range(1, 5):
482
self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)
484
# Check shelving worked
485
for i in range(1, 5):
486
self.assertEqual(file('test_file%d' % i).read(), self.ORIGINAL)
488
# We should now have 00-03
489
for i in range(0, 4):
490
self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
493
self.run_bzr('unshelve', '--all', '00', retcode=0)
494
self.assertEqual(file('test_file1').read(), self.MODIFIED)
497
lines = self.capture('shelf ls', retcode=0).split('\n')
499
self.assertFalse(line.startswith(' 00'))
501
# Check we can reshelve once we've unshelved out of order, should be 04
502
self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
503
self.run_bzr('shelve', '--all')
504
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
507
text = self.capture('shelf ls', retcode=0)
508
for line in text.split('\n'):
509
self.assertFalse(line.startswith(' 00'))
511
# We now have 01,02,03,04
513
self.run_bzr('unshelve', '--all', '02', retcode=0)
514
self.assertEqual(file('test_file3').read(), self.MODIFIED)
516
# Unshelve the default, this is the reshelved 00, hence modifies file 1
517
self.run_bzr('unshelve', '--all', retcode=0)
518
self.assertEqual(file('test_file1').read(), self.MODIFIED)
520
def test_shelf_switch_basic(self):
521
self.tree = self.make_branch_and_tree('.')
522
self.__create_and_add_test_file()
524
# This should go to "default"
525
file('test_file', 'w').write(self.MODIFIED)
526
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
529
self.run_bzr('shelf', 'switch', 'other', retcode=0)
530
file('test_file', 'w').write(self.MODIFIED)
531
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
534
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
535
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
536
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
539
self.run_bzr('shelf', 'switch', 'default', retcode=0)
540
file('test_file', 'w').write(self.MODIFIED)
541
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
544
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
545
self.assertFalse(os.path.exists('.shelf/shelves/other/01'))
547
def test_shelf_bad_patch_arg(self):
548
self.tree = self.make_branch_and_tree('.')
550
# Check the bad arg handling
551
stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
552
self.assertTrue("Patch '01' doesn't exist on shelf" in error)
554
stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
555
self.assertTrue("Invalid patch name 'foo'" in error)
557
# Hex and is cracky, so it shouldn't work
558
stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
559
self.assertTrue("Invalid patch name '0x00'" in error)
561
def test_color_hunk_selector(self):
562
"""Make sure NoColor is raised iff terminal.has_ansi_colors is False"""
563
hs = ShelveHunkSelector([])
564
hs = UnshelveHunkSelector([])
566
from bzrlib.plugins.bzrtools import terminal
568
from bzrtools import terminal
569
old_has_ansi_colors = terminal.has_ansi_colors
570
terminal.has_ansi_colors = lambda: False
572
self.assertRaises(NoColor, ShelveHunkSelector, [], True)
573
self.assertRaises(NoColor, UnshelveHunkSelector, [], True)
574
terminal.has_ansi_colors = lambda: True
575
hs = ShelveHunkSelector([], color=True)
576
hs = UnshelveHunkSelector([], color=True)
578
terminal.has_ansi_colors = old_has_ansi_colors
580
def test_no_color(self):
581
"""Ensure --no-color switch can be passed"""
582
self.tree = self.make_branch_and_tree('.')
586
self.tree.add(subdir)
589
self.__create_and_add_test_file()
591
# Modify the test file
592
# write in binary mode because on win32 line-endings should be LF
593
f = file('test_file', 'wb')
594
f.write(self.MODIFIED)
596
stdout, error = self.run_bzr_captured(['shelve', '--all',
598
stdout, error = self.run_bzr_captured(['unshelve', '--all',
added
removed
tests/shelf_tests.py
