← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2007-06-12 22:09:44 UTC
  • mfrom: (540.1.2 bzrtools-0.17)
  • Revision ID: aaron.bentley@utoronto.ca-20070612220944-5zw4hlzp1ctq6mkl
Merge fixes from 0.17

Show diffs side-by-side

added added

removed removed

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