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