← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to tests/shelf_tests.py

  • Committer: Charlie Shepherd
  • Date: 2007-04-04 18:12:00 UTC
  • mto: This revision was merged to the branch mainline in revision 538.
  • Revision ID: masterdriverz@gentoo.org-20070404181200-wqiwytdor9srux2v
Remove all trailing whitespace

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