← Back to branch summary

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to shelf_tests.py

  • Committer: Aaron Bentley
  • Date: 2006-03-16 15:06:54 UTC
  • Revision ID: abentley@panoramicfeedback.com-20060316150654-9eabd1c1d7ea804e
Fixed checkout handling in Shelve

Show diffs side-by-side

added added

removed removed

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