« back to all changes in this revision
Viewing changes to tests/shelf_tests.py
- browse files at revision 412
- compare with another revision
- download diff
- download tarball
- view history from revision 412
- Committer: Aaron Bentley
- Date: 2006-07-05 05:32:42 UTC
- Revision ID: aaron.bentley@utoronto.ca-20060705053242-b9bbea9d1acd32d6
Make Ellerman's cdiff colours the default
- files added:
- .be/bugs/1e6d3356-5668-47f3-b451-5285bcc0ec3b
- .be/bugs/4ddc9130-fe72-4d0c-9848-157ad6f2c14d
- .be/bugs/7c3b4f3e-33c5-4112-b8df-c209ec6cc8b6
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments
- .be/bugs/9312b4cf-379e-490b-bfb5-dfb81357ee25/comments/906938f4-be68-4d65-9b75-def07743b043
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713
- .be/bugs/bad9a00f-50f5-4782-9da6-722fb0a58c93
- .be/bugs/da0f16ce-1ee0-4f9e-bf1a-9a78c4a7e765
- .be/bugs/dbd10145-51f8-4bda-96d9-06b5d3ef80b8
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments
- .be/bugs/fdc2b62a-9622-4f08-ac78-bd2603a4e0af/comments/f13e3358-1a65-4a45-9472-781548bc3fc3
- debian
- external
- obsolete
- patches
- tests
- files removed:
- .bzrignore
- files renamed:
- scriptlib.py => bzrtools.py
- baz2bzr => obsolete/baz2bzr
- bzr-pull => obsolete/bzr-pull
- bzr-push => obsolete/bzr-push
- files modified:
- .be/bugs/07f6e226-092a-4e69-8891-307903604c93/values
added
removed
tests/shelf_tests.py
1
#!/usr/bin/python
2
3
from bzrlib.diff import _patch_header_date
4
import bzrlib.tests
5
import os.path
6
7
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
8
ORIGINAL = '\n\nhello test world\n\n'
9
MODIFIED = '\n\ngoodbye test world\n\n'
10
DIFF_HEADER = "=== modified file '%(filename)s'\n"
11
DIFF_1 = """--- %(filename)s\t%(old_date)s
12
+++ %(filename)s\t%(new_date)s
13
@@ -1,4 +1,4 @@
14
15
16
-hello test world
17
+goodbye test world
18
19
"""
20
DIFF_2 = """--- test_file\t%(old_date)s
21
+++ test_file\t%(new_date)s
22
@@ -1,4 +1,4 @@
23
24
25
-goodbye test world
26
+hello test world
27
28
"""
29
def _check_diff(self, diff=DIFF_1, filename='test_file'):
30
old_tree = self.tree.basis_tree()
31
old_date = _patch_header_date(old_tree,
32
old_tree.inventory.path2id(filename),
33
filename)
34
new_date = _patch_header_date(self.tree,
35
self.tree.inventory.path2id(filename),
36
filename)
37
keys = { 'filename' : filename , 'old_date': old_date,
38
'new_date': new_date}
39
hdr = self.DIFF_HEADER % keys
40
diff = diff % keys
41
self.assertEqual(self.capture('diff', retcode=1), hdr + diff + '\n')
42
43
def _check_shelf(self, idx, diff=DIFF_1, filename='test_file',
44
new_date=None):
45
old_tree = self.tree.basis_tree()
46
old_date = _patch_header_date(old_tree,
47
old_tree.inventory.path2id(filename),
48
filename)
49
diff = diff % { 'filename' : filename, 'old_date': old_date,
50
'new_date': new_date}
51
shelf = open(os.path.join(self.tree.basedir,
52
'.shelf/shelves/default/' + idx)).read()
53
shelf = shelf[shelf.index('\n') + 1:] # skip the message
54
self.assertEqual(shelf, diff)
55
56
def test_shelf(self):
57
self.__test_loop(1)
58
59
def test_shelf_multi(self):
60
self.__test_loop(10)
61
62
def __test_loop(self, count):
63
self.tree = self.make_branch_and_tree('.')
64
self.__create_and_add_test_file()
65
66
while count > 0:
67
count -= 1
68
69
# Modify the test file
70
file('test_file', 'w').write(self.MODIFIED)
71
72
self._check_diff()
73
74
new_date = _patch_header_date(self.tree,
75
self.tree.inventory.path2id('test_file'), 'test_file')
76
77
# Shelve the changes
78
self.run_bzr('shelve', '--all', retcode=0)
79
80
# Make sure there is no diff anymore
81
self.assertEqual(self.capture('diff', retcode=0), '')
82
83
# Make sure the file is actually back the way it was
84
self.assertEqual(file('test_file').read(), self.ORIGINAL)
85
86
self._check_shelf('00', new_date=new_date)
87
88
# Unshelve
89
self.run_bzr('unshelve', '--all', retcode=0)
90
91
self._check_diff()
92
93
# Check the shelved patch was backed up
94
self._check_shelf('00~', new_date=new_date)
95
96
# Make sure the file is back the way it should be
97
self.assertEqual(file('test_file').read(), self.MODIFIED)
98
99
def test_shelf_nothing_to_shelve(self):
100
import os.path
101
self.tree = self.make_branch_and_tree('.')
102
self.__create_and_add_test_file()
103
104
# Shelve the changes
105
self.run_bzr('shelve', '--all', retcode=3)
106
107
if os.path.exists(os.path.join(self.tree.branch.base,
108
'.shelf/shelves/default/00')):
109
self.fail("Shelf exists, but it shouldn't")
110
111
def __create_and_add_test_file(self, filename='test_file'):
112
f = open(filename, 'w')
113
f.write(self.ORIGINAL)
114
f.close()
115
self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))
116
self.tree.commit(message='add %s' % filename)
117
118
def test_shelf_with_revision(self):
119
self.tree = self.make_branch_and_tree('.')
120
121
self.__create_and_add_test_file()
122
123
# Modify the test file and commit it
124
self.build_tree_contents([('test_file', self.MODIFIED)])
125
self.tree.commit(message='update test_file')
126
127
# Shelve the changes
128
self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
129
130
self._check_diff(self.DIFF_2)
131
132
# Make sure the file is the way it should be
133
self.assertEqual(file('test_file').read(), self.ORIGINAL)
134
135
# Unshelve
136
self.run_bzr('unshelve', '--all', retcode=0)
137
138
# Make sure the file is back the way it should be
139
self.assertEqual(file('test_file').read(), self.MODIFIED)
140
141
def test_shelf_with_two_revisions(self):
142
self.tree = self.make_branch_and_tree('.')
143
144
cmd = 'shelve --all -r 1..2'
145
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
146
147
self.assertEqual(stderr.split('\n')[0],
148
'bzr: ERROR: shelve only accepts a single revision parameter.')
149
150
def test_shelf_show_basic(self):
151
self.tree = self.make_branch_and_tree('.')
152
self.__create_and_add_test_file()
153
self.__test_show(self.tree, '00')
154
155
def __test_show(self, tree, patch):
156
# Modify the test file
157
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
158
159
# Shelve the changes
160
self.run_bzr('shelve', '--all', retcode=0)
161
162
# Make sure there is no diff anymore
163
self.assertEqual(self.capture('diff', retcode=0), '')
164
165
# Check the shelf is right
166
shelf = open(os.path.join(self.tree.basedir,
167
'.shelf/shelves/default', patch)).read()
168
self.assertTrue('patch %s' % patch in shelf)
169
170
# Check the shown output is right
171
shown = self.capture('shelf show %s' % patch, retcode=0)
172
self.assertEqual(shown, shelf)
173
174
def test_shelf_show_multi(self):
175
self.tree = self.make_branch_and_tree('.')
176
self.__create_and_add_test_file()
177
self.__test_show(self.tree, '00')
178
self.__test_show(self.tree, '01')
179
self.__test_show(self.tree, '02')
180
181
# Now check we can show a previously shelved patch
182
shelf = open(os.path.join(self.tree.basedir,
183
'.shelf/shelves/default/00')).read()
184
self.assertTrue('patch 00' in shelf)
185
186
# Check the shown output is right
187
shown = self.capture('shelf show 00', retcode=0)
188
self.assertEqual(shown, shelf)
189
190
def test_shelf_show_unspecified(self):
191
self.tree = self.make_branch_and_tree('.')
192
self.__create_and_add_test_file()
193
self.__test_show(self.tree, '00')
194
self.__test_show(self.tree, '01')
195
self.__test_show(self.tree, '02')
196
197
# Check that not specifying at patch gets us the most recent
198
shelf = open(os.path.join(self.tree.basedir,
199
'.shelf/shelves/default/02')).read()
200
self.assertTrue('patch 02' in shelf)
201
202
# Check the shown output is right
203
shown = self.capture('shelf show', retcode=0)
204
self.assertEqual(shown, shelf)
205
206
def test_shelf_show_with_no_patch(self):
207
self.tree = self.make_branch_and_tree('.')
208
stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
209
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
210
211
def test_shelf_unshelve_failure(self):
212
self.tree = self.make_branch_and_tree('.')
213
214
self.__create_and_add_test_file()
215
216
# Modify the test file
217
file('test_file', 'w').write(self.MODIFIED)
218
219
# Shelve the changes
220
self.run_bzr('shelve', '--all', retcode=0)
221
222
# Write an unapplyable patch into the shelf
223
shelf = open(os.path.join(self.tree.basedir,
224
'.shelf/shelves/default/00'), 'w')
225
shelf.write(self.DIFF_2)
226
shelf.close()
227
228
# Unshelve, should fail
229
self.run_bzr('unshelve', '--all', retcode=3)
230
231
# Make sure the patch is still there, eventhough it's broken
232
shelf = open(os.path.join(self.tree.basedir,
233
'.shelf/shelves/default/00')).read()
234
self.assertEqual(shelf, self.DIFF_2)
235
236
# Working tree should be unchanged
237
diff = self.capture('diff', retcode=0)
238
self.assertEqual(diff, '')
239
240
def test_shelf_unshelve_failure_two_hunks(self):
241
self.tree = self.make_branch_and_tree('.')
242
243
self.__create_and_add_test_file()
244
self.__create_and_add_test_file(filename='test_file2')
245
246
# Modify the test files
247
file('test_file', 'w').write(self.MODIFIED)
248
file('test_file2', 'w').write(self.MODIFIED)
249
250
# Shelve the changes
251
self.run_bzr('shelve', '--all', retcode=0)
252
253
# Put the changes to test_file back, the shelved patch won't apply now
254
file('test_file', 'w').write(self.MODIFIED)
255
self.tree.commit(message='screw up test_file')
256
257
# Unshelve, should fail
258
self.run_bzr('unshelve', '--all', retcode=3)
259
260
# Working tree should be unchanged
261
diff = self.capture('diff', retcode=0)
262
self.assertEqual(diff, '')
263
264
# Force should succeed and modify test_file2, but leave shelf
265
self.run_bzr('unshelve', '--force', '--all', retcode=0)
266
self.assertEqual(open('test_file2').read(), self.MODIFIED)
267
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
268
269
def test_shelf_after_unshelve(self):
270
self.tree = self.make_branch_and_tree('.')
271
272
self.__create_and_add_test_file()
273
self.__create_and_add_test_file(filename='test_file2')
274
275
# Modify the test files
276
file('test_file', 'w').write(self.MODIFIED)
277
file('test_file2', 'w').write(self.MODIFIED)
278
279
# Shelve the changes
280
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
281
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
282
283
# Unshelve
284
self.run_bzr('unshelve', '--all', retcode=0)
285
286
# We should now have 00 and 01~
287
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
288
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
289
290
# Check ls works
291
lines = self.capture('shelf ls', retcode=0).split('\n')
292
for line in lines:
293
self.assertFalse(line.startswith(' 01'))
294
295
# Unshelve, if unshelve is confused by the backup it will fail
296
self.run_bzr('unshelve', '--all', retcode=0)
297
298
def test_shelf_delete(self):
299
self.tree = self.make_branch_and_tree('.')
300
301
self.__create_and_add_test_file()
302
self.__create_and_add_test_file(filename='test_file2')
303
304
# Modify the test files
305
file('test_file', 'w').write(self.MODIFIED)
306
file('test_file2', 'w').write(self.MODIFIED)
307
new_date = _patch_header_date(self.tree,
308
self.tree.inventory.path2id('test_file'), 'test_file')
309
310
# Shelve the changes
311
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
312
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
313
314
self._check_shelf('00', new_date=new_date)
315
316
# Delete 00
317
self.run_bzr('shelf', 'delete', '00', retcode=0)
318
319
# We should now have 01 but not 00, but we should have 00~
320
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
321
self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
322
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
323
324
# Check the backup is right
325
self._check_shelf('00~', new_date=new_date)
326
327
# Check ls works
328
lines = self.capture('shelf ls', retcode=0).split('\n')
329
for line in lines:
330
self.assertFalse(line.startswith(' 00'))
331
332
# Unshelve should unshelve 01
333
self.run_bzr('unshelve', '--all', retcode=0)
334
self.assertEqual(file('test_file2').read(), self.MODIFIED)
335
336
def test_shelf_gaps(self):
337
self.tree = self.make_branch_and_tree('.')
338
self.__create_and_add_test_file()
339
file('test_file', 'w').write(self.MODIFIED)
340
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
341
file('test_file', 'w').write(self.MODIFIED)
342
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
343
344
# Now delete 00, leaving 01, next shelve should go into 02
345
self.run_bzr('shelf', 'delete', '0', retcode=0)
346
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
347
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
348
file('test_file', 'w').write(self.MODIFIED)
349
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
350
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
351
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
352
353
def test_shelf_upgrade(self):
354
self.tree = self.make_branch_and_tree('.')
355
356
self.__create_and_add_test_file()
357
358
# Modify then shelve, so we're not upgrading to 00, just for kicks
359
file('test_file', 'w').write(self.MODIFIED)
360
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
361
362
open('.bzr-shelf', 'w').write('First old shelf')
363
open('.bzr-shelf-1', 'w').write('Second old shelf')
364
open('.bzr-shelf-3', 'w').write('Fourth old shelf')
365
366
# shelve and unshelve should bitch and do nothing
367
file('test_file', 'w').write('blah blah blah')
368
self.run_bzr('shelve', '--all', retcode=3)
369
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
370
self.assertEqual(file('test_file').read(), 'blah blah blah')
371
self.run_bzr('unshelve', '--all', retcode=3)
372
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
373
374
# Upgrade, make sure it worked
375
self.run_bzr('shelf', 'upgrade', retcode=0)
376
self.assertEqual(open('.shelf/shelves/default/01').read(),
377
'First old shelf')
378
self.assertEqual(open('.shelf/shelves/default/02').read(),
379
'Second old shelf')
380
self.assertEqual(open('.shelf/shelves/default/03').read(),
381
'Fourth old shelf')
382
383
# Check the old shelves got backed up right
384
self.assertTrue(os.path.exists('.bzr-shelf~'))
385
self.assertTrue(os.path.exists('.bzr-shelf-1~'))
386
self.assertTrue(os.path.exists('.bzr-shelf-3~'))
387
self.assertFalse(os.path.exists('.bzr-shelf'))
388
self.assertFalse(os.path.exists('.bzr-shelf-1'))
389
self.assertFalse(os.path.exists('.bzr-shelf-3'))
390
391
# Shelve should work now
392
self.run_bzr('shelve', '--all', retcode=0)
393
394
def test_shelf_p1_patch(self):
395
self.tree = self.make_branch_and_tree('.')
396
397
self.__create_and_add_test_file()
398
399
# Run a benign shelf command to setup .shelf for us
400
self.run_bzr('shelf', 'ls', retcode=0)
401
402
old_tree = self.tree.basis_tree()
403
old_date = _patch_header_date(old_tree,
404
old_tree.inventory.path2id('test_file'),
405
'test_file')
406
new_date = _patch_header_date(self.tree,
407
self.tree.inventory.path2id('test_file'),
408
'test_file')
409
# Fake a -p0 shelved patch
410
diff = self.DIFF_1 % { 'filename' : 'test_file', 'old_date': old_date,
411
'new_date' : new_date}
412
diff = diff.replace('--- ', '--- a/')
413
diff = diff.replace('+++ ', '+++ b/')
414
open('.shelf/shelves/default/00', 'w').write(diff)
415
416
# This should work
417
self.run_bzr('unshelve', '--all', retcode=0)
418
419
self._check_diff()
420
421
def test_shelf_shelve_in_subdir(self):
422
self.tree = self.make_branch_and_tree('.')
423
424
subdir = 'subdir'
425
os.mkdir(subdir)
426
self.tree.add(subdir)
427
os.chdir(subdir)
428
429
self.__create_and_add_test_file()
430
431
# Modify the test file
432
file('test_file', 'w').write(self.MODIFIED)
433
434
# Shelve the changes
435
self.run_bzr('shelve', '--all', retcode=0)
436
437
# Working tree should be unchanged
438
diff = self.capture('diff', retcode=0)
439
self.assertEqual(diff, '')
440
441
# Unshelve, should succeed
442
self.run_bzr('unshelve', '--all', retcode=0)
443
444
self._check_diff(filename='subdir/test_file')
445
446
# Make sure relative filenames work ok
447
self.run_bzr('shelve', 'test_file', '--all', retcode=0)
448
449
def test_shelf_shelf_bogus_subcommand(self):
450
self.tree = self.make_branch_and_tree('.')
451
self.run_bzr('shelf', 'foo', retcode=3) # <- retcode == 3
452
453
def test_shelf_OOO_unshelve(self):
454
self.tree = self.make_branch_and_tree('.')
455
456
for i in range(1, 5):
457
self.__create_and_add_test_file(filename='test_file%d' % i)
458
459
# Modify the test files
460
for i in range(1, 5):
461
file('test_file%d' % i, 'w').write(self.MODIFIED)
462
463
# Shelve the changes
464
for i in range(1, 5):
465
self.run_bzr('shelve', '--all', 'test_file%d' % i, retcode=0)
466
467
# Check shelving worked
468
for i in range(1, 5):
469
self.assertEqual(file('test_file%d' % i).read(), self.ORIGINAL)
470
471
# We should now have 00-03
472
for i in range(0, 4):
473
self.assertTrue(os.path.exists('.shelf/shelves/default/0%d' % i))
474
475
# Unshelve 00
476
self.run_bzr('unshelve', '--all', '00', retcode=0)
477
self.assertEqual(file('test_file1').read(), self.MODIFIED)
478
479
# Check ls works
480
lines = self.capture('shelf ls', retcode=0).split('\n')
481
for line in lines:
482
self.assertFalse(line.startswith(' 00'))
483
484
# Check we can reshelve once we've unshelved out of order, should be 04
485
self.assertFalse(os.path.exists('.shelf/shelves/default/04'))
486
self.run_bzr('shelve', '--all')
487
self.assertTrue(os.path.exists('.shelf/shelves/default/04'))
488
489
# Check ls works
490
text = self.capture('shelf ls', retcode=0)
491
for line in text.split('\n'):
492
self.assertFalse(line.startswith(' 00'))
493
494
# We now have 01,02,03,04
495
# Unshelve 02
496
self.run_bzr('unshelve', '--all', '02', retcode=0)
497
self.assertEqual(file('test_file3').read(), self.MODIFIED)
498
499
# Unshelve the default, this is the reshelved 00, hence modifies file 1
500
self.run_bzr('unshelve', '--all', retcode=0)
501
self.assertEqual(file('test_file1').read(), self.MODIFIED)
502
503
def test_shelf_switch_basic(self):
504
self.tree = self.make_branch_and_tree('.')
505
self.__create_and_add_test_file()
506
507
# This should go to "default"
508
file('test_file', 'w').write(self.MODIFIED)
509
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
510
511
# Switch to "other"
512
self.run_bzr('shelf', 'switch', 'other', retcode=0)
513
file('test_file', 'w').write(self.MODIFIED)
514
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
515
516
# Check it worked
517
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
518
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
519
self.assertTrue(os.path.exists('.shelf/shelves/other/00'))
520
521
# Switch back
522
self.run_bzr('shelf', 'switch', 'default', retcode=0)
523
file('test_file', 'w').write(self.MODIFIED)
524
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
525
526
# Check that worked
527
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
528
self.assertFalse(os.path.exists('.shelf/shelves/other/01'))
529
530
def test_shelf_bad_patch_arg(self):
531
self.tree = self.make_branch_and_tree('.')
532
533
# Check the bad arg handling
534
stdout, error = self.run_bzr_captured(['unshelve', '01'], retcode=3)
535
self.assertTrue("Patch '01' doesn't exist on shelf" in error)
536
537
stdout, error = self.run_bzr_captured(['unshelve', 'foo'], retcode=3)
538
self.assertTrue("Invalid patch name 'foo'" in error)
539
540
# Hex and is cracky, so it shouldn't work
541
stdout, error = self.run_bzr_captured(['unshelve', '0x00'], retcode=3)
542
self.assertTrue("Invalid patch name '0x00'" in error)
Loggerhead is a web-based interface for Breezy
Version: 2.0.1