← 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: 2006-03-24 17:24:21 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060324172421-c1acc18c1a4075a6
Added multi-pull, working on branches and checkouts

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
 
1
#!/usr/bin/python
 
2
 
 
3
import bzrlib.tests
1
4
import os.path
2
 
from bzrlib.diff import _patch_header_date
3
 
import bzrlib.tests
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.command_classes import cmd_shelf
11
 
 
12
5
 
13
6
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
14
7
    ORIGINAL = '\n\nhello test world\n\n'
15
8
    MODIFIED = '\n\ngoodbye test world\n\n'
16
 
    DIFF_HEADER = "=== modified file '%(filename)s'\n"
17
 
    DIFF_1 = """--- %(filename)s\t%(old_date)s
18
 
+++ %(filename)s\t%(new_date)s
 
9
    DIFF_HEADER = "=== modified file 'a/test_file'\n"
 
10
    DIFF_1 = """--- a/test_file\t
 
11
+++ b/test_file\t
19
12
@@ -1,4 +1,4 @@
20
13
 
21
14
 
23
16
+goodbye test world
24
17
 
25
18
"""
26
 
    DIFF_2 = """--- test_file\t%(old_date)s
27
 
+++ test_file\t%(new_date)s
 
19
    DIFF_2 = """--- a/test_file\t
 
20
+++ b/test_file\t
28
21
@@ -1,4 +1,4 @@
29
22
 
30
23
 
32
25
+hello test world
33
26
 
34
27
"""
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.run_bzr('diff', retcode=1)[0], 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
 
 
71
28
    def test_shelf(self):
72
29
        self.__test_loop(1)
73
30
 
75
32
        self.__test_loop(10)
76
33
 
77
34
    def __test_loop(self, count):
78
 
        self.tree = self.make_branch_and_tree('.')
79
 
        self.__create_and_add_test_file()
80
 
        for counter in range(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
 
81
41
            # Modify the test file
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()
 
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')
96
47
 
97
48
            # Shelve the changes
98
 
            self.run_bzr('shelve --all', retcode=0)
 
49
            self.run_bzr('shelve', '--all', retcode=0)
99
50
 
100
51
            # Make sure there is no diff anymore
101
 
            self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
 
52
            self.assertEqual(self.capture('diff', retcode=0), '')
102
53
 
103
54
            # Make sure the file is actually back the way it was
104
55
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
105
56
 
106
 
            self._check_shelf('00', new_date=new_date)
 
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)
107
62
 
108
63
            # Unshelve
109
 
            self.run_bzr('unshelve --all', retcode=0)
 
64
            self.run_bzr('unshelve', '--all', retcode=0)
110
65
 
111
 
            self._check_diff()
 
66
            # Check the diff is right again
 
67
            self.assertEqual(self.capture('diff', retcode=1),
 
68
                self.DIFF_HEADER + self.DIFF_1 + '\n')
112
69
 
113
70
            # Check the shelved patch was backed up
114
 
            self._check_shelf('00~', new_date=new_date)
 
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)
115
75
 
116
76
            # Make sure the file is back the way it should be
117
77
            self.assertEqual(file('test_file').read(), self.MODIFIED)
118
78
 
119
79
    def test_shelf_nothing_to_shelve(self):
120
80
        import os.path
121
 
        self.tree = self.make_branch_and_tree('.')
122
 
        self.__create_and_add_test_file()
 
81
        tree = self.make_branch_and_tree('.')
 
82
        self.__create_and_add_test_file(tree)
123
83
 
124
84
        # Shelve the changes
125
 
        self.run_bzr('shelve --all', retcode=3)
 
85
        self.run_bzr('shelve', '--all', retcode=3)
126
86
 
127
 
        if os.path.exists(os.path.join(self.tree.branch.base,
 
87
        if os.path.exists(os.path.join(tree.branch.base,
128
88
                '.shelf/shelves/default/00')):
129
89
            self.fail("Shelf exists, but it shouldn't")
130
90
 
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')
 
91
    def __create_and_add_test_file(self, tree, filename='test_file'):
 
92
        f = open(filename, 'w')
134
93
        f.write(self.ORIGINAL)
135
94
        f.close()
136
 
        self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))
137
 
        self.tree.commit(message='add %s' % filename)
 
95
        tree.add(tree.relpath(os.path.join(os.getcwd(), filename)))
 
96
        tree.commit(message='add %s' % filename)
138
97
 
139
98
    def test_shelf_with_revision(self):
140
 
        self.tree = self.make_branch_and_tree('.')
 
99
        tree = self.make_branch_and_tree('.')
141
100
 
142
 
        self.__create_and_add_test_file()
 
101
        self.__create_and_add_test_file(tree)
143
102
 
144
103
        # Modify the test file and commit it
145
104
        self.build_tree_contents([('test_file', self.MODIFIED)])
146
 
        self.tree.commit(message='update test_file')
 
105
        tree.commit(message='update test_file')
147
106
 
148
107
        # Shelve the changes
149
 
        self.run_bzr('shelve --all -r 1', retcode=0)
 
108
        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
150
109
 
151
 
        self._check_diff(self.DIFF_2)
 
110
        # Check the diff is right
 
111
        self.assertEqual(self.capture('diff', retcode=1),
 
112
            self.DIFF_HEADER + self.DIFF_2 + '\n')
152
113
 
153
114
        # Make sure the file is the way it should be
154
115
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
155
116
 
156
117
        # Unshelve
157
 
        self.run_bzr('unshelve --all', retcode=0)
 
118
        self.run_bzr('unshelve', '--all', retcode=0)
158
119
 
159
120
        # Make sure the file is back the way it should be
160
121
        self.assertEqual(file('test_file').read(), self.MODIFIED)
161
122
 
162
123
    def test_shelf_with_two_revisions(self):
163
 
        self.tree = self.make_branch_and_tree('.')
 
124
        tree = self.make_branch_and_tree('.')
164
125
 
165
 
        stdout, stderr = self.run_bzr('shelve --all -r 1..2', retcode=None)
 
126
        cmd = 'shelve --all -r 1..2'
 
127
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
166
128
 
167
129
        self.assertEqual(stderr.split('\n')[0],
168
130
            'bzr: ERROR: shelve only accepts a single revision parameter.')
169
131
 
170
132
    def test_shelf_show_basic(self):
171
 
        self.tree = self.make_branch_and_tree('.')
172
 
        self.__create_and_add_test_file()
173
 
        self.__test_show(self.tree, '00')
 
133
        tree = self.make_branch_and_tree('.')
 
134
        self.__create_and_add_test_file(tree)
 
135
        self.__test_show(tree, '00')
174
136
 
175
137
    def __test_show(self, tree, patch):
176
138
        # Modify the test file
177
139
        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
178
140
 
179
141
        # Shelve the changes
180
 
        self.run_bzr('shelve --all', retcode=0)
 
142
        self.run_bzr('shelve', '--all', retcode=0)
181
143
 
182
144
        # Make sure there is no diff anymore
183
 
        self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
 
145
        self.assertEqual(self.capture('diff', retcode=0), '')
184
146
 
185
147
        # Check the shelf is right
186
 
        shelf = open(os.path.join(self.tree.basedir,
 
148
        shelf = open(os.path.join(tree.branch.base,
187
149
                    '.shelf/shelves/default', patch)).read()
188
150
        self.assertTrue('patch %s' % patch in shelf)
189
151
 
190
152
        # Check the shown output is right
191
 
        shown = self.run_bzr('shelf show %s' % patch, retcode=0)[0]
 
153
        shown = self.capture('shelf show %s' % patch, retcode=0)
192
154
        self.assertEqual(shown, shelf)
193
155
 
194
156
    def test_shelf_show_multi(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')
 
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')
200
162
 
201
163
        # Now check we can show a previously shelved patch
202
 
        shelf = open(os.path.join(self.tree.basedir,
 
164
        shelf = open(os.path.join(tree.branch.base,
203
165
                    '.shelf/shelves/default/00')).read()
204
166
        self.assertTrue('patch 00' in shelf)
205
167
 
206
168
        # Check the shown output is right
207
 
        shown = self.run_bzr('shelf show 00', retcode=0)[0]
208
 
        self.assertEqual(shown, shelf)
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.run_bzr('shelf show', retcode=0)[0]
 
169
        shown = self.capture('shelf show 00', retcode=0)
224
170
        self.assertEqual(shown, shelf)
225
171
 
226
172
    def test_shelf_show_with_no_patch(self):
227
 
        self.tree = self.make_branch_and_tree('.')
228
 
        stderr = self.run_bzr('shelf show 00', retcode=None)[1]
 
173
        tree = self.make_branch_and_tree('.')
 
174
        stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
229
175
        self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
230
176
 
231
177
    def test_shelf_unshelve_failure(self):
232
 
        self.tree = self.make_branch_and_tree('.')
 
178
        tree = self.make_branch_and_tree('.')
233
179
 
234
 
        self.__create_and_add_test_file()
 
180
        self.__create_and_add_test_file(tree)
235
181
 
236
182
        # Modify the test file
237
183
        file('test_file', 'w').write(self.MODIFIED)
238
184
 
239
185
        # Shelve the changes
240
 
        self.run_bzr('shelve --all', retcode=0)
 
186
        self.run_bzr('shelve', '--all', retcode=0)
241
187
 
242
188
        # Write an unapplyable patch into the shelf
243
 
        shelf = open(os.path.join(self.tree.basedir,
 
189
        shelf = open(os.path.join(tree.branch.base,
244
190
                    '.shelf/shelves/default/00'), 'w')
245
191
        shelf.write(self.DIFF_2)
246
192
        shelf.close()
247
193
 
248
194
        # Unshelve, should fail
249
 
        self.run_bzr('unshelve --all', retcode=3)
 
195
        self.run_bzr('unshelve', '--all', retcode=3)
250
196
 
251
197
        # Make sure the patch is still there, eventhough it's broken
252
 
        shelf = open(os.path.join(self.tree.basedir,
 
198
        shelf = open(os.path.join(tree.branch.base,
253
199
                    '.shelf/shelves/default/00')).read()
254
200
        self.assertEqual(shelf, self.DIFF_2)
255
201
 
256
202
        # Working tree should be unchanged
257
 
        diff = self.run_bzr('diff', retcode=0)[0]
 
203
        diff = self.capture('diff', retcode=0)
258
204
        self.assertEqual(diff, '')
259
205
 
260
206
    def test_shelf_unshelve_failure_two_hunks(self):
261
 
        self.tree = self.make_branch_and_tree('.')
 
207
        tree = self.make_branch_and_tree('.')
262
208
 
263
 
        self.__create_and_add_test_file()
264
 
        self.__create_and_add_test_file(filename='test_file2')
 
209
        self.__create_and_add_test_file(tree)
 
210
        self.__create_and_add_test_file(tree, filename='test_file2')
265
211
 
266
212
        # Modify the test files
267
213
        file('test_file', 'w').write(self.MODIFIED)
268
214
        file('test_file2', 'w').write(self.MODIFIED)
269
215
 
270
216
        # Shelve the changes
271
 
        self.run_bzr('shelve --all', retcode=0)
 
217
        self.run_bzr('shelve', '--all', retcode=0)
272
218
 
273
219
        # Put the changes to test_file back, the shelved patch won't apply now
274
220
        file('test_file', 'w').write(self.MODIFIED)
275
 
        self.tree.commit(message='screw up test_file')
 
221
        tree.commit(message='screw up test_file')
276
222
 
277
223
        # Unshelve, should fail
278
 
        self.run_bzr('unshelve --all', retcode=3)
 
224
        self.run_bzr('unshelve', '--all', retcode=3)
279
225
 
280
226
        # Working tree should be unchanged
281
 
        diff = self.run_bzr('diff', retcode=0)[0]
 
227
        diff = self.capture('diff', retcode=0)
282
228
        self.assertEqual(diff, '')
283
229
 
284
230
        # Force should succeed and modify test_file2, but leave shelf
285
 
        self.run_bzr('unshelve --force --all', retcode=0)
 
231
        self.run_bzr('unshelve', '--force', '--all', retcode=0)
286
232
        self.assertEqual(open('test_file2').read(), self.MODIFIED)
287
233
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
288
234
 
289
235
    def test_shelf_after_unshelve(self):
290
 
        self.tree = self.make_branch_and_tree('.')
 
236
        tree = self.make_branch_and_tree('.')
291
237
 
292
 
        self.__create_and_add_test_file()
293
 
        self.__create_and_add_test_file(filename='test_file2')
 
238
        self.__create_and_add_test_file(tree)
 
239
        self.__create_and_add_test_file(tree, filename='test_file2')
294
240
 
295
241
        # Modify the test files
296
242
        file('test_file', 'w').write(self.MODIFIED)
297
243
        file('test_file2', 'w').write(self.MODIFIED)
298
244
 
299
245
        # Shelve the changes
300
 
        self.run_bzr('shelve --all test_file', retcode=0)
301
 
        self.run_bzr('shelve --all test_file2', retcode=0)
 
246
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
247
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
302
248
 
303
249
        # Unshelve
304
 
        self.run_bzr('unshelve --all', retcode=0)
 
250
        self.run_bzr('unshelve', '--all', retcode=0)
305
251
 
306
252
        # We should now have 00 and 01~
307
253
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
308
254
        self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
309
255
 
310
256
        # Check ls works
311
 
        lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
312
 
        for line in lines:
 
257
        list = self.capture('shelf ls', retcode=0).split('\n')
 
258
        for line in list:
313
259
            self.assertFalse(line.startswith(' 01'))
314
260
 
315
261
        # Unshelve, if unshelve is confused by the backup it will fail
316
 
        self.run_bzr('unshelve --all', retcode=0)
 
262
        self.run_bzr('unshelve', '--all', retcode=0)
317
263
 
318
264
    def test_shelf_delete(self):
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()
 
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)
337
273
 
338
274
        # Shelve the changes
339
 
        self.run_bzr('shelve --all test_file', retcode=0)
340
 
        self.run_bzr('shelve --all test_file2', retcode=0)
341
 
 
342
 
        self._check_shelf('00', new_date=new_date)
 
275
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
276
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
343
277
 
344
278
        # Delete 00
345
 
        self.run_bzr('shelf delete 00', retcode=0)
 
279
        self.run_bzr('shelf', 'delete', '00', retcode=0)
346
280
 
347
 
        # We should now have 01 but not 00, but we should have 00~
 
281
        # We should now have 01 but not 00
348
282
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
349
 
        self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
350
283
        self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
351
284
 
352
 
        # Check the backup is right
353
 
        self._check_shelf('00~', new_date=new_date)
354
 
 
355
285
        # Check ls works
356
 
        lines = self.run_bzr('shelf ls', retcode=0)[0].split('\n')
357
 
        for line in lines:
 
286
        list = self.capture('shelf ls', retcode=0).split('\n')
 
287
        for line in list:
358
288
            self.assertFalse(line.startswith(' 00'))
359
289
 
360
290
        # Unshelve should unshelve 01
361
 
        self.run_bzr('unshelve --all', retcode=0)
 
291
        self.run_bzr('unshelve', '--all', retcode=0)
362
292
        self.assertEqual(file('test_file2').read(), self.MODIFIED)
363
293
 
364
294
    def test_shelf_gaps(self):
365
 
        self.tree = self.make_branch_and_tree('.')
366
 
        self.__create_and_add_test_file()
367
 
        file('test_file', 'w').write(self.MODIFIED)
368
 
        self.run_bzr('shelve --all test_file', retcode=0)
369
 
        file('test_file', 'w').write(self.MODIFIED)
370
 
        self.run_bzr('shelve --all test_file', retcode=0)
 
295
        tree = self.make_branch_and_tree('.')
 
296
        self.__create_and_add_test_file(tree)
 
297
        file('test_file', 'w').write(self.MODIFIED)
 
298
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
299
        file('test_file', 'w').write(self.MODIFIED)
 
300
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
371
301
 
372
302
        # Now delete 00, leaving 01, next shelve should go into 02
373
 
        self.run_bzr('shelf delete 0', retcode=0)
 
303
        self.run_bzr('shelf', 'delete', '0', retcode=0)
374
304
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
375
305
        self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
376
306
        file('test_file', 'w').write(self.MODIFIED)
377
 
        self.run_bzr('shelve --all test_file', retcode=0)
 
307
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
378
308
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
379
309
        self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
380
310
 
381
311
    def test_shelf_upgrade(self):
382
 
        self.tree = self.make_branch_and_tree('.')
 
312
        tree = self.make_branch_and_tree('.')
383
313
 
384
 
        self.__create_and_add_test_file()
 
314
        self.__create_and_add_test_file(tree)
385
315
 
386
316
        # Modify then shelve, so we're not upgrading to 00, just for kicks
387
317
        file('test_file', 'w').write(self.MODIFIED)
388
 
        self.run_bzr('shelve --all test_file', retcode=0)
 
318
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
389
319
 
390
320
        open('.bzr-shelf', 'w').write('First old shelf')
391
321
        open('.bzr-shelf-1', 'w').write('Second old shelf')
393
323
 
394
324
        # shelve and unshelve should bitch and do nothing
395
325
        file('test_file', 'w').write('blah blah blah')
396
 
        self.run_bzr('shelve --all', retcode=3)
 
326
        self.run_bzr('shelve', '--all', retcode=3)
397
327
        self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
398
328
        self.assertEqual(file('test_file').read(), 'blah blah blah')
399
 
        self.run_bzr('unshelve --all', retcode=3)
 
329
        self.run_bzr('unshelve', '--all', retcode=3)
400
330
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
401
331
 
402
332
        # Upgrade, make sure it worked
403
 
        self.run_bzr('shelf upgrade', retcode=0)
 
333
        self.run_bzr('shelf', 'upgrade', retcode=0)
404
334
        self.assertEqual(open('.shelf/shelves/default/01').read(),
405
335
                'First old shelf')
406
336
        self.assertEqual(open('.shelf/shelves/default/02').read(),
417
347
        self.assertFalse(os.path.exists('.bzr-shelf-3'))
418
348
 
419
349
        # Shelve should work now
420
 
        self.run_bzr('shelve --all', retcode=0)
421
 
 
422
 
    def test_shelf_p1_patch(self):
423
 
        self.tree = self.make_branch_and_tree('.')
424
 
 
425
 
        self.__create_and_add_test_file()
 
350
        self.run_bzr('shelve', '--all', retcode=0)
 
351
 
 
352
    def test_shelf_p0_patch(self):
 
353
        tree = self.make_branch_and_tree('.')
 
354
 
 
355
        self.__create_and_add_test_file(tree)
426
356
 
427
357
        # Run a benign shelf command to setup .shelf for us
428
 
        self.run_bzr('shelf ls', retcode=0)
 
358
        self.run_bzr('shelf', 'ls', retcode=0)
429
359
 
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()
442
360
        # Fake a -p0 shelved patch
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/')
 
361
        diff = self.DIFF_1
 
362
        diff = diff.replace('a/', '')
 
363
        diff = diff.replace('b/', '')
447
364
        open('.shelf/shelves/default/00', 'w').write(diff)
448
365
 
449
366
        # This should work
450
 
        self.run_bzr('unshelve --all', retcode=0)
 
367
        self.run_bzr('unshelve', '--all', retcode=0)
451
368
 
452
 
        self._check_diff()
 
369
        # Check the diff is right
 
370
        self.assertEqual(self.capture('diff', retcode=1),
 
371
            self.DIFF_HEADER + self.DIFF_1 + '\n')
453
372
 
454
373
    def test_shelf_shelve_in_subdir(self):
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()
 
374
        tree = self.make_branch_and_tree('.')
 
375
 
 
376
        self.__create_and_add_test_file(tree)
463
377
 
464
378
        # Modify the test file
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()
 
379
        file('test_file', 'w').write(self.MODIFIED)
469
380
 
470
381
        # Shelve the changes
471
 
        self.run_bzr('shelve --all', retcode=0)
 
382
        self.run_bzr('shelve', '--all', retcode=0)
472
383
 
473
384
        # Working tree should be unchanged
474
 
        diff = self.run_bzr('diff', retcode=0)[0]
 
385
        diff = self.capture('diff', retcode=0)
475
386
        self.assertEqual(diff, '')
476
387
 
477
388
        # Unshelve, should succeed
478
 
        self.run_bzr('unshelve --all', retcode=0)
479
 
 
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.run_bzr('shelf ls', retcode=0)[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.run_bzr('shelf ls', retcode=0)[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_binary(self):
567
 
        self.tree = self.make_branch_and_tree('.')
568
 
        self.build_tree_contents([('file', '\x00')])
569
 
        self.tree.add('file')
570
 
        self.run_bzr_error(['Changes involve binary files.'], 'shelve --all')
571
 
 
572
 
    def test_shelf_bad_patch_arg(self):
573
 
        self.tree = self.make_branch_and_tree('.')
574
 
 
575
 
        # Check the bad arg handling
576
 
        stdout, error = self.run_bzr('unshelve 01', retcode=3)
577
 
        self.assertTrue("Patch '01' doesn't exist on shelf" in error)
578
 
 
579
 
        stdout, error = self.run_bzr('unshelve foo', retcode=3)
580
 
        self.assertTrue("Invalid patch name 'foo'" in error)
581
 
 
582
 
        # Hex and is cracky, so it shouldn't work
583
 
        stdout, error = self.run_bzr(['unshelve', '0x00'], retcode=3)
584
 
        self.assertTrue("Invalid patch name '0x00'" in error)
585
 
 
586
 
    def test_color_hunk_selector(self):
587
 
        """Make sure NoColor is raised iff terminal.has_ansi_colors is False"""
588
 
        hs = ShelveHunkSelector([])
589
 
        hs = UnshelveHunkSelector([])
590
 
        try:
591
 
            from bzrlib.plugins.bzrtools import terminal
592
 
        except ImportError:
593
 
            from bzrtools import terminal
594
 
        old_has_ansi_colors = terminal.has_ansi_colors
595
 
        terminal.has_ansi_colors = lambda: False
596
 
        try:
597
 
            self.assertRaises(NoColor, ShelveHunkSelector, [], True)
598
 
            self.assertRaises(NoColor, UnshelveHunkSelector, [], True)
599
 
            terminal.has_ansi_colors = lambda: True
600
 
            hs = ShelveHunkSelector([], color=True)
601
 
            hs = UnshelveHunkSelector([], color=True)
602
 
        finally:
603
 
            terminal.has_ansi_colors = old_has_ansi_colors
604
 
 
605
 
    def test_no_color(self):
606
 
        """Ensure --no-color switch can be passed"""
607
 
        self.tree = self.make_branch_and_tree('.')
608
 
 
609
 
        subdir = 'subdir'
610
 
        os.mkdir(subdir)
611
 
        self.tree.add(subdir)
612
 
        os.chdir(subdir)
613
 
 
614
 
        self.__create_and_add_test_file()
615
 
 
616
 
        # Modify the test file
617
 
        # write in binary mode because on win32 line-endings should be LF
618
 
        f = file('test_file', 'wb')
619
 
        f.write(self.MODIFIED)
620
 
        f.close()
621
 
        stdout, error = self.run_bzr('shelve --all --no-color')
622
 
        stdout, error = self.run_bzr('unshelve --all --no-color')
623
 
 
624
 
    def test_shelf_help(self):
625
 
        self.assertContainsRe(cmd_shelf().help(),
626
 
                              'list\n.*List the patches on the current shelf')
627
 
 
628
 
    def test_show_empty_shelf(self):
629
 
        self.tree = self.make_branch_and_tree('.')
630
 
        self.run_bzr_error(('No patches on shelf.',), 'shelf show')
 
389
        self.run_bzr('unshelve', '--all', retcode=0)
 
390
 
 
391
        # Check the diff is right
 
392
        self.assertEqual(self.capture('diff', retcode=1),
 
393
            self.DIFF_HEADER + self.DIFF_1 + '\n')