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