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