← 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: 2012-01-20 02:00:40 UTC
  • Revision ID: aaron@aaronbentley.com-20120120020040-7y4c93fhnnahidxg
Remove rspush

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/shelf_tests.py
1
 
#!/usr/bin/python
2
 
 
 
1
import os.path
 
2
from bzrlib.diff import _patch_header_date
3
3
import bzrlib.tests
4
 
import os.path
 
4
 
 
5
from bzrlib.plugins.bzrtools.hunk_selector import (
 
6
    ShelveHunkSelector,
 
7
    UnshelveHunkSelector,
 
8
    )
 
9
from bzrlib.plugins.bzrtools.errors import NoColor
 
10
from bzrlib.plugins.bzrtools import command
 
11
from bzrlib.plugins.bzrtools.command_classes import cmd_shelf1
 
12
 
5
13
 
6
14
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
7
15
    ORIGINAL = '\n\nhello test world\n\n'
8
16
    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
 
17
    DIFF_HEADER = "=== modified file '%(filename)s'\n"
 
18
    DIFF_1 = """--- %(filename)s\t%(old_date)s
 
19
+++ %(filename)s\t%(new_date)s
12
20
@@ -1,4 +1,4 @@
13
21
 
14
22
 
16
24
+goodbye test world
17
25
 
18
26
"""
19
 
    DIFF_2 = """--- a/test_file\t
20
 
+++ b/test_file\t
 
27
    DIFF_2 = """--- test_file\t%(old_date)s
 
28
+++ test_file\t%(new_date)s
21
29
@@ -1,4 +1,4 @@
22
30
 
23
31
 
25
33
+hello test world
26
34
 
27
35
"""
 
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
 
28
77
    def test_shelf(self):
29
78
        self.__test_loop(1)
30
79
 
32
81
        self.__test_loop(10)
33
82
 
34
83
    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
 
 
 
84
        self.tree = self.make_branch_and_tree('.')
 
85
        self.__create_and_add_test_file()
 
86
        for counter in range(count):
41
87
            # 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')
 
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()
47
102
 
48
103
            # Shelve the changes
49
 
            self.run_bzr('shelve', '--all', retcode=0)
 
104
            self.run_bzr('shelve1 --all', retcode=0)
50
105
 
51
106
            # Make sure there is no diff anymore
52
 
            self.assertEqual(self.capture('diff', retcode=0), '')
 
107
            self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
53
108
 
54
109
            # Make sure the file is actually back the way it was
55
110
            self.assertEqual(file('test_file').read(), self.ORIGINAL)
56
111
 
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)
 
112
            self._check_shelf('00', new_date=new_date)
62
113
 
63
114
            # Unshelve
64
 
            self.run_bzr('unshelve', '--all', retcode=0)
 
115
            self.run_bzr('unshelve1 --all', retcode=0)
65
116
 
66
 
            # Check the diff is right again
67
 
            self.assertEqual(self.capture('diff', retcode=1),
68
 
                self.DIFF_HEADER + self.DIFF_1 + '\n')
 
117
            self._check_diff()
69
118
 
70
119
            # 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)
 
120
            self._check_shelf('00~', new_date=new_date)
75
121
 
76
122
            # Make sure the file is back the way it should be
77
123
            self.assertEqual(file('test_file').read(), self.MODIFIED)
78
124
 
79
125
    def test_shelf_nothing_to_shelve(self):
80
126
        import os.path
81
 
        tree = self.make_branch_and_tree('.')
82
 
        self.__create_and_add_test_file(tree)
 
127
        self.tree = self.make_branch_and_tree('.')
 
128
        self.__create_and_add_test_file()
83
129
 
84
130
        # Shelve the changes
85
 
        self.run_bzr('shelve', '--all', retcode=3)
 
131
        self.run_bzr('shelve1 --all', retcode=3)
86
132
 
87
 
        if os.path.exists(os.path.join(tree.branch.base,
 
133
        if os.path.exists(os.path.join(self.tree.branch.base,
88
134
                '.shelf/shelves/default/00')):
89
135
            self.fail("Shelf exists, but it shouldn't")
90
136
 
91
 
    def __create_and_add_test_file(self, tree, filename='test_file'):
92
 
        f = open(filename, 'w')
 
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')
93
140
        f.write(self.ORIGINAL)
94
141
        f.close()
95
 
        tree.add(tree.relpath(os.path.join(os.getcwd(), filename)))
96
 
        tree.commit(message='add %s' % filename)
 
142
        self.tree.add(self.tree.relpath(os.path.join(os.getcwd(), filename)))
 
143
        self.tree.commit(message='add %s' % filename)
97
144
 
98
145
    def test_shelf_with_revision(self):
99
 
        tree = self.make_branch_and_tree('.')
 
146
        self.tree = self.make_branch_and_tree('.')
100
147
 
101
 
        self.__create_and_add_test_file(tree)
 
148
        self.__create_and_add_test_file()
102
149
 
103
150
        # Modify the test file and commit it
104
151
        self.build_tree_contents([('test_file', self.MODIFIED)])
105
 
        tree.commit(message='update test_file')
 
152
        self.tree.commit(message='update test_file')
106
153
 
107
154
        # Shelve the changes
108
 
        self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
 
155
        self.run_bzr('shelve1 --all -r 1', retcode=0)
109
156
 
110
 
        # Check the diff is right
111
 
        self.assertEqual(self.capture('diff', retcode=1),
112
 
            self.DIFF_HEADER + self.DIFF_2 + '\n')
 
157
        self._check_diff(self.DIFF_2)
113
158
 
114
159
        # Make sure the file is the way it should be
115
160
        self.assertEqual(file('test_file').read(), self.ORIGINAL)
116
161
 
117
162
        # Unshelve
118
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
163
        self.run_bzr('unshelve1 --all', retcode=0)
119
164
 
120
165
        # Make sure the file is back the way it should be
121
166
        self.assertEqual(file('test_file').read(), self.MODIFIED)
122
167
 
123
168
    def test_shelf_with_two_revisions(self):
124
 
        tree = self.make_branch_and_tree('.')
 
169
        self.tree = self.make_branch_and_tree('.')
125
170
 
126
 
        cmd = 'shelve --all -r 1..2'
127
 
        (stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
 
171
        stdout, stderr = self.run_bzr('shelve1 --all -r 1..2', retcode=None)
128
172
 
129
173
        self.assertEqual(stderr.split('\n')[0],
130
174
            'bzr: ERROR: shelve only accepts a single revision parameter.')
131
175
 
132
176
    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')
 
177
        self.tree = self.make_branch_and_tree('.')
 
178
        self.__create_and_add_test_file()
 
179
        self.__test_show(self.tree, '00')
136
180
 
137
181
    def __test_show(self, tree, patch):
138
182
        # Modify the test file
139
183
        self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
140
184
 
141
185
        # Shelve the changes
142
 
        self.run_bzr('shelve', '--all', retcode=0)
 
186
        self.run_bzr('shelve1 --all', retcode=0)
143
187
 
144
188
        # Make sure there is no diff anymore
145
 
        self.assertEqual(self.capture('diff', retcode=0), '')
 
189
        self.assertEqual(self.run_bzr('diff', retcode=0)[0], '')
146
190
 
147
191
        # Check the shelf is right
148
 
        shelf = open(os.path.join(tree.branch.base,
 
192
        shelf = open(os.path.join(self.tree.basedir,
149
193
                    '.shelf/shelves/default', patch)).read()
150
194
        self.assertTrue('patch %s' % patch in shelf)
151
195
 
152
196
        # Check the shown output is right
153
 
        shown = self.capture('shelf show %s' % patch, retcode=0)
 
197
        shown = self.run_bzr('shelf1 show %s' % patch, retcode=0)[0]
154
198
        self.assertEqual(shown, shelf)
155
199
 
156
200
    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')
 
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')
162
206
 
163
207
        # Now check we can show a previously shelved patch
164
 
        shelf = open(os.path.join(tree.branch.base,
 
208
        shelf = open(os.path.join(self.tree.basedir,
165
209
                    '.shelf/shelves/default/00')).read()
166
210
        self.assertTrue('patch 00' in shelf)
167
211
 
168
212
        # Check the shown output is right
169
 
        shown = self.capture('shelf show 00', retcode=0)
 
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]
170
230
        self.assertEqual(shown, shelf)
171
231
 
172
232
    def test_shelf_show_with_no_patch(self):
173
 
        tree = self.make_branch_and_tree('.')
174
 
        stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
 
233
        self.tree = self.make_branch_and_tree('.')
 
234
        stderr = self.run_bzr('shelf1 show 00', retcode=None)[1]
175
235
        self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
176
236
 
177
237
    def test_shelf_unshelve_failure(self):
178
 
        tree = self.make_branch_and_tree('.')
 
238
        self.tree = self.make_branch_and_tree('.')
179
239
 
180
 
        self.__create_and_add_test_file(tree)
 
240
        self.__create_and_add_test_file()
181
241
 
182
242
        # Modify the test file
183
243
        file('test_file', 'w').write(self.MODIFIED)
184
244
 
185
245
        # Shelve the changes
186
 
        self.run_bzr('shelve', '--all', retcode=0)
 
246
        self.run_bzr('shelve1 --all', retcode=0)
187
247
 
188
248
        # Write an unapplyable patch into the shelf
189
 
        shelf = open(os.path.join(tree.branch.base,
 
249
        shelf = open(os.path.join(self.tree.basedir,
190
250
                    '.shelf/shelves/default/00'), 'w')
191
251
        shelf.write(self.DIFF_2)
192
252
        shelf.close()
193
253
 
194
254
        # Unshelve, should fail
195
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
255
        self.run_bzr('unshelve1 --all', retcode=3)
196
256
 
197
257
        # Make sure the patch is still there, eventhough it's broken
198
 
        shelf = open(os.path.join(tree.branch.base,
 
258
        shelf = open(os.path.join(self.tree.basedir,
199
259
                    '.shelf/shelves/default/00')).read()
200
260
        self.assertEqual(shelf, self.DIFF_2)
201
261
 
202
262
        # Working tree should be unchanged
203
 
        diff = self.capture('diff', retcode=0)
 
263
        diff = self.run_bzr('diff', retcode=0)[0]
204
264
        self.assertEqual(diff, '')
205
265
 
206
266
    def test_shelf_unshelve_failure_two_hunks(self):
207
 
        tree = self.make_branch_and_tree('.')
 
267
        self.tree = self.make_branch_and_tree('.')
208
268
 
209
 
        self.__create_and_add_test_file(tree)
210
 
        self.__create_and_add_test_file(tree, filename='test_file2')
 
269
        self.__create_and_add_test_file()
 
270
        self.__create_and_add_test_file(filename='test_file2')
211
271
 
212
272
        # Modify the test files
213
273
        file('test_file', 'w').write(self.MODIFIED)
214
274
        file('test_file2', 'w').write(self.MODIFIED)
215
275
 
216
276
        # Shelve the changes
217
 
        self.run_bzr('shelve', '--all', retcode=0)
 
277
        self.run_bzr('shelve1 --all', retcode=0)
218
278
 
219
279
        # Put the changes to test_file back, the shelved patch won't apply now
220
280
        file('test_file', 'w').write(self.MODIFIED)
221
 
        tree.commit(message='screw up test_file')
 
281
        self.tree.commit(message='screw up test_file')
222
282
 
223
283
        # Unshelve, should fail
224
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
284
        self.run_bzr('unshelve1 --all', retcode=3)
225
285
 
226
286
        # Working tree should be unchanged
227
 
        diff = self.capture('diff', retcode=0)
 
287
        diff = self.run_bzr('diff', retcode=0)[0]
228
288
        self.assertEqual(diff, '')
229
289
 
230
290
        # Force should succeed and modify test_file2, but leave shelf
231
 
        self.run_bzr('unshelve', '--force', '--all', retcode=0)
 
291
        self.run_bzr('unshelve1 --force --all', retcode=0)
232
292
        self.assertEqual(open('test_file2').read(), self.MODIFIED)
233
293
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
234
294
 
235
295
    def test_shelf_after_unshelve(self):
236
 
        tree = self.make_branch_and_tree('.')
 
296
        self.tree = self.make_branch_and_tree('.')
237
297
 
238
 
        self.__create_and_add_test_file(tree)
239
 
        self.__create_and_add_test_file(tree, filename='test_file2')
 
298
        self.__create_and_add_test_file()
 
299
        self.__create_and_add_test_file(filename='test_file2')
240
300
 
241
301
        # Modify the test files
242
302
        file('test_file', 'w').write(self.MODIFIED)
243
303
        file('test_file2', 'w').write(self.MODIFIED)
244
304
 
245
305
        # Shelve the changes
246
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
247
 
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
306
        self.run_bzr('shelve1 --all test_file', retcode=0)
 
307
        self.run_bzr('shelve1 --all test_file2', retcode=0)
248
308
 
249
309
        # Unshelve
250
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
310
        self.run_bzr('unshelve1 --all', retcode=0)
251
311
 
252
312
        # We should now have 00 and 01~
253
313
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
254
314
        self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
255
315
 
256
316
        # Check ls works
257
 
        list = self.capture('shelf ls', retcode=0).split('\n')
258
 
        for line in list:
 
317
        lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
 
318
        for line in lines:
259
319
            self.assertFalse(line.startswith(' 01'))
260
320
 
261
321
        # Unshelve, if unshelve is confused by the backup it will fail
262
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
322
        self.run_bzr('unshelve1 --all', retcode=0)
263
323
 
264
324
    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)
 
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()
273
343
 
274
344
        # Shelve the changes
275
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
276
 
        self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
 
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)
277
349
 
278
350
        # Delete 00
279
 
        self.run_bzr('shelf', 'delete', '00', retcode=0)
 
351
        self.run_bzr('shelf1 delete 00', retcode=0)
280
352
 
281
 
        # We should now have 01 but not 00
 
353
        # We should now have 01 but not 00, but we should have 00~
282
354
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
 
355
        self.assertTrue(os.path.exists('.shelf/shelves/default/00~'))
283
356
        self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
284
357
 
 
358
        # Check the backup is right
 
359
        self._check_shelf('00~', new_date=new_date)
 
360
 
285
361
        # Check ls works
286
 
        list = self.capture('shelf ls', retcode=0).split('\n')
287
 
        for line in list:
 
362
        lines = self.run_bzr('shelf1 ls', retcode=0)[0].split('\n')
 
363
        for line in lines:
288
364
            self.assertFalse(line.startswith(' 00'))
289
365
 
290
366
        # Unshelve should unshelve 01
291
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
367
        self.run_bzr('unshelve1 --all', retcode=0)
292
368
        self.assertEqual(file('test_file2').read(), self.MODIFIED)
293
369
 
294
370
    def test_shelf_gaps(self):
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
        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)
301
377
 
302
378
        # Now delete 00, leaving 01, next shelve should go into 02
303
 
        self.run_bzr('shelf', 'delete', '0', retcode=0)
 
379
        self.run_bzr('shelf1 delete 0', retcode=0)
304
380
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
305
381
        self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
306
382
        file('test_file', 'w').write(self.MODIFIED)
307
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
383
        self.run_bzr('shelve1 --all test_file', retcode=0)
308
384
        self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
309
385
        self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
310
386
 
311
387
    def test_shelf_upgrade(self):
312
 
        tree = self.make_branch_and_tree('.')
 
388
        self.tree = self.make_branch_and_tree('.')
313
389
 
314
 
        self.__create_and_add_test_file(tree)
 
390
        self.__create_and_add_test_file()
315
391
 
316
392
        # Modify then shelve, so we're not upgrading to 00, just for kicks
317
393
        file('test_file', 'w').write(self.MODIFIED)
318
 
        self.run_bzr('shelve', '--all', 'test_file', retcode=0)
 
394
        self.run_bzr('shelve1 --all test_file', retcode=0)
319
395
 
320
396
        open('.bzr-shelf', 'w').write('First old shelf')
321
397
        open('.bzr-shelf-1', 'w').write('Second old shelf')
323
399
 
324
400
        # shelve and unshelve should bitch and do nothing
325
401
        file('test_file', 'w').write('blah blah blah')
326
 
        self.run_bzr('shelve', '--all', retcode=3)
 
402
        self.run_bzr('shelve1 --all', retcode=3)
327
403
        self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
328
404
        self.assertEqual(file('test_file').read(), 'blah blah blah')
329
 
        self.run_bzr('unshelve', '--all', retcode=3)
 
405
        self.run_bzr('unshelve1 --all', retcode=3)
330
406
        self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
331
407
 
332
408
        # Upgrade, make sure it worked
333
 
        self.run_bzr('shelf', 'upgrade', retcode=0)
 
409
        self.run_bzr('shelf1 upgrade', retcode=0)
334
410
        self.assertEqual(open('.shelf/shelves/default/01').read(),
335
411
                'First old shelf')
336
412
        self.assertEqual(open('.shelf/shelves/default/02').read(),
347
423
        self.assertFalse(os.path.exists('.bzr-shelf-3'))
348
424
 
349
425
        # Shelve should work now
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
        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()
356
432
 
357
433
        # Run a benign shelf command to setup .shelf for us
358
 
        self.run_bzr('shelf', 'ls', retcode=0)
 
434
        self.run_bzr('shelf1 ls', retcode=0)
359
435
 
 
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()
360
448
        # Fake a -p0 shelved patch
361
 
        diff = self.DIFF_1
362
 
        diff = diff.replace('a/', '')
363
 
        diff = diff.replace('b/', '')
 
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/')
364
453
        open('.shelf/shelves/default/00', 'w').write(diff)
365
454
 
366
455
        # This should work
367
 
        self.run_bzr('unshelve', '--all', retcode=0)
 
456
        self.run_bzr('unshelve1 --all', retcode=0)
368
457
 
369
 
        # Check the diff is right
370
 
        self.assertEqual(self.capture('diff', retcode=1),
371
 
            self.DIFF_HEADER + self.DIFF_1 + '\n')
 
458
        self._check_diff()
372
459
 
373
460
    def test_shelf_shelve_in_subdir(self):
374
 
        tree = self.make_branch_and_tree('.')
375
 
 
376
 
        self.__create_and_add_test_file(tree)
 
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()
377
469
 
378
470
        # Modify the test file
379
 
        file('test_file', 'w').write(self.MODIFIED)
 
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()
380
475
 
381
476
        # Shelve the changes
382
 
        self.run_bzr('shelve', '--all', retcode=0)
 
477
        self.run_bzr('shelve1 --all', retcode=0)
383
478
 
384
479
        # Working tree should be unchanged
385
 
        diff = self.capture('diff', retcode=0)
 
480
        diff = self.run_bzr('diff', retcode=0)[0]
386
481
        self.assertEqual(diff, '')
387
482
 
388
483
        # Unshelve, should succeed
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')
 
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')