← 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: 2009-08-20 04:49:51 UTC
  • mfrom: (718.1.1 bzrtools)
  • Revision ID: aaron@aaronbentley.com-20090820044951-7x7wv9vm6f9xm1co
Merge 1.18 branch.

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