« back to all changes in this revision
Viewing changes to shelf_tests.py
- browse files at revision 167
- compare with another revision
- download diff
- download tarball
- view history from revision 167
- Committer: Aaron Bentley
- Date: 2005-09-20 15:02:04 UTC
- Revision ID: abentley@panoramicfeedback.com-20050920150204-2abd154eca9213bc
Moved extention lists to dotgraph
- files added:
- .bzrignore
- files removed:
- .be/bugs/4ddc9130-fe72-4d0c-9848-157ad6f2c14d
- .be/bugs/7c3b4f3e-33c5-4112-b8df-c209ec6cc8b6
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments
- .be/bugs/aa3f38e8-8544-498f-893e-dec21b1b8f13/comments/e53c2ce1-5b28-4e48-8453-bad891786713
- external
- patches
- tests
- files renamed:
- NEWS.moved => NEWS
- obsolete/annotate.py => annotate.py
- fetch_ghosts.py => fetch_missing.py
- files modified:
- INSTALL
added
removed
shelf_tests.py
1
#!/usr/bin/python
2
3
import bzrlib.tests
4
import os.path
5
6
class ShelfTests(bzrlib.tests.TestCaseWithTransport):
7
ORIGINAL = '\n\nhello test world\n\n'
8
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
12
@@ -1,4 +1,4 @@
13
14
15
-hello test world
16
+goodbye test world
17
18
"""
19
DIFF_2 = """--- a/test_file\t
20
+++ b/test_file\t
21
@@ -1,4 +1,4 @@
22
23
24
-goodbye test world
25
+hello test world
26
27
"""
28
def test_shelf(self):
29
self.__test_loop(1)
30
31
def test_shelf_multi(self):
32
self.__test_loop(10)
33
34
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
41
# 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')
47
48
# Shelve the changes
49
self.run_bzr('shelve', '--all', retcode=0)
50
51
# Make sure there is no diff anymore
52
self.assertEqual(self.capture('diff', retcode=0), '')
53
54
# Make sure the file is actually back the way it was
55
self.assertEqual(file('test_file').read(), self.ORIGINAL)
56
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)
62
63
# Unshelve
64
self.run_bzr('unshelve', '--all', retcode=0)
65
66
# Check the diff is right again
67
self.assertEqual(self.capture('diff', retcode=1),
68
self.DIFF_HEADER + self.DIFF_1 + '\n')
69
70
# 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)
75
76
# Make sure the file is back the way it should be
77
self.assertEqual(file('test_file').read(), self.MODIFIED)
78
79
def test_shelf_nothing_to_shelve(self):
80
import os.path
81
tree = self.make_branch_and_tree('.')
82
self.__create_and_add_test_file(tree)
83
84
# Shelve the changes
85
self.run_bzr('shelve', '--all', retcode=3)
86
87
if os.path.exists(os.path.join(tree.branch.base,
88
'.shelf/shelves/default/00')):
89
self.fail("Shelf exists, but it shouldn't")
90
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)
95
96
def test_shelf_with_revision(self):
97
tree = self.make_branch_and_tree('.')
98
99
self.__create_and_add_test_file(tree)
100
101
# Modify the test file and commit it
102
self.build_tree_contents([('test_file', self.MODIFIED)])
103
tree.commit(message='update test_file')
104
105
# Shelve the changes
106
self.run_bzr('shelve', '--all', '-r', '1', retcode=0)
107
108
# Check the diff is right
109
self.assertEqual(self.capture('diff', retcode=1),
110
self.DIFF_HEADER + self.DIFF_2 + '\n')
111
112
# Make sure the file is the way it should be
113
self.assertEqual(file('test_file').read(), self.ORIGINAL)
114
115
# Unshelve
116
self.run_bzr('unshelve', '--all', retcode=0)
117
118
# Make sure the file is back the way it should be
119
self.assertEqual(file('test_file').read(), self.MODIFIED)
120
121
def test_shelf_with_two_revisions(self):
122
tree = self.make_branch_and_tree('.')
123
124
cmd = 'shelve --all -r 1..2'
125
(stdout, stderr) = self.run_bzr_captured(cmd.split(), retcode=None)
126
127
self.assertEqual(stderr.split('\n')[0],
128
'bzr: ERROR: shelve only accepts a single revision parameter.')
129
130
def test_shelf_show_basic(self):
131
tree = self.make_branch_and_tree('.')
132
self.__create_and_add_test_file(tree)
133
self.__test_show(tree, '00')
134
135
def __test_show(self, tree, patch):
136
# Modify the test file
137
self.build_tree_contents([('test_file', 'patch %s\n' % patch)])
138
139
# Shelve the changes
140
self.run_bzr('shelve', '--all', retcode=0)
141
142
# Make sure there is no diff anymore
143
self.assertEqual(self.capture('diff', retcode=0), '')
144
145
# Check the shelf is right
146
shelf = open(os.path.join(tree.branch.base,
147
'.shelf/shelves/default', patch)).read()
148
self.assertTrue('patch %s' % patch in shelf)
149
150
# Check the shown output is right
151
shown = self.capture('shelf show %s' % patch, retcode=0)
152
self.assertEqual(shown, shelf)
153
154
def test_shelf_show_multi(self):
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')
160
161
# Now check we can show a previously shelved patch
162
shelf = open(os.path.join(tree.branch.base,
163
'.shelf/shelves/default/00')).read()
164
self.assertTrue('patch 00' in shelf)
165
166
# Check the shown output is right
167
shown = self.capture('shelf show 00', retcode=0)
168
self.assertEqual(shown, shelf)
169
170
def test_shelf_show_with_no_patch(self):
171
tree = self.make_branch_and_tree('.')
172
stderr = self.run_bzr_captured(['shelf', 'show', '00'], retcode=None)[1]
173
self.assertTrue("Patch '00' doesn't exist on shelf default!" in stderr)
174
175
def test_shelf_unshelve_failure(self):
176
tree = self.make_branch_and_tree('.')
177
178
self.__create_and_add_test_file(tree)
179
180
# Modify the test file
181
file('test_file', 'w').write(self.MODIFIED)
182
183
# Shelve the changes
184
self.run_bzr('shelve', '--all', retcode=0)
185
186
# Write an unapplyable patch into the shelf
187
shelf = open(os.path.join(tree.branch.base,
188
'.shelf/shelves/default/00'), 'w')
189
shelf.write(self.DIFF_2)
190
shelf.close()
191
192
# Unshelve, should fail
193
self.run_bzr('unshelve', '--all', retcode=3)
194
195
# Make sure the patch is still there, eventhough it's broken
196
shelf = open(os.path.join(tree.branch.base,
197
'.shelf/shelves/default/00')).read()
198
self.assertEqual(shelf, self.DIFF_2)
199
200
# Working tree should be unchanged
201
diff = self.capture('diff', retcode=0)
202
self.assertEqual(diff, '')
203
204
def test_shelf_unshelve_failure_two_hunks(self):
205
tree = self.make_branch_and_tree('.')
206
207
self.__create_and_add_test_file(tree)
208
self.__create_and_add_test_file(tree, filename='test_file2')
209
210
# Modify the test files
211
file('test_file', 'w').write(self.MODIFIED)
212
file('test_file2', 'w').write(self.MODIFIED)
213
214
# Shelve the changes
215
self.run_bzr('shelve', '--all', retcode=0)
216
217
# Put the changes to test_file back, the shelved patch won't apply now
218
file('test_file', 'w').write(self.MODIFIED)
219
tree.commit(message='screw up test_file')
220
221
# Unshelve, should fail
222
self.run_bzr('unshelve', '--all', retcode=3)
223
224
# Working tree should be unchanged
225
diff = self.capture('diff', retcode=0)
226
self.assertEqual(diff, '')
227
228
# Force should succeed and modify test_file2, but leave shelf
229
self.run_bzr('unshelve', '--force', '--all', retcode=0)
230
self.assertEqual(open('test_file2').read(), self.MODIFIED)
231
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
232
233
def test_shelf_after_unshelve(self):
234
tree = self.make_branch_and_tree('.')
235
236
self.__create_and_add_test_file(tree)
237
self.__create_and_add_test_file(tree, filename='test_file2')
238
239
# Modify the test files
240
file('test_file', 'w').write(self.MODIFIED)
241
file('test_file2', 'w').write(self.MODIFIED)
242
243
# Shelve the changes
244
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
245
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
246
247
# Unshelve
248
self.run_bzr('unshelve', '--all', retcode=0)
249
250
# We should now have 00 and 01~
251
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
252
self.assertTrue(os.path.exists('.shelf/shelves/default/01~'))
253
254
# Check ls works
255
list = self.capture('shelf ls', retcode=0).split('\n')
256
for line in list:
257
self.assertFalse(line.startswith(' 01'))
258
259
# Unshelve, if unshelve is confused by the backup it will fail
260
self.run_bzr('unshelve', '--all', retcode=0)
261
262
def test_shelf_delete(self):
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)
271
272
# Shelve the changes
273
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
274
self.run_bzr('shelve', '--all', 'test_file2', retcode=0)
275
276
# Delete 00
277
self.run_bzr('shelf', 'delete', '00', retcode=0)
278
279
# We should now have 01 but not 00
280
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
281
self.assertTrue(os.path.exists('.shelf/shelves/default/01'))
282
283
# Check ls works
284
list = self.capture('shelf ls', retcode=0).split('\n')
285
for line in list:
286
self.assertFalse(line.startswith(' 00'))
287
288
# Unshelve should unshelve 01
289
self.run_bzr('unshelve', '--all', retcode=0)
290
self.assertEqual(file('test_file2').read(), self.MODIFIED)
291
292
def test_shelf_gaps(self):
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)
299
300
# Now delete 00, leaving 01, next shelve should go into 02
301
self.run_bzr('shelf', 'delete', '0', retcode=0)
302
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
303
self.assertFalse(os.path.exists('.shelf/shelves/default/02'))
304
file('test_file', 'w').write(self.MODIFIED)
305
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
306
self.assertFalse(os.path.exists('.shelf/shelves/default/00'))
307
self.assertTrue(os.path.exists('.shelf/shelves/default/02'))
308
309
def test_shelf_upgrade(self):
310
tree = self.make_branch_and_tree('.')
311
312
self.__create_and_add_test_file(tree)
313
314
# Modify then shelve, so we're not upgrading to 00, just for kicks
315
file('test_file', 'w').write(self.MODIFIED)
316
self.run_bzr('shelve', '--all', 'test_file', retcode=0)
317
318
open('.bzr-shelf', 'w').write('First old shelf')
319
open('.bzr-shelf-1', 'w').write('Second old shelf')
320
open('.bzr-shelf-3', 'w').write('Fourth old shelf')
321
322
# shelve and unshelve should bitch and do nothing
323
file('test_file', 'w').write('blah blah blah')
324
self.run_bzr('shelve', '--all', retcode=3)
325
self.assertFalse(os.path.exists('.shelf/shelves/default/01'))
326
self.assertEqual(file('test_file').read(), 'blah blah blah')
327
self.run_bzr('unshelve', '--all', retcode=3)
328
self.assertTrue(os.path.exists('.shelf/shelves/default/00'))
329
330
# Upgrade, make sure it worked
331
self.run_bzr('shelf', 'upgrade', retcode=0)
332
self.assertEqual(open('.shelf/shelves/default/01').read(),
333
'First old shelf')
334
self.assertEqual(open('.shelf/shelves/default/02').read(),
335
'Second old shelf')
336
self.assertEqual(open('.shelf/shelves/default/03').read(),
337
'Fourth old shelf')
338
339
# Check the old shelves got backed up right
340
self.assertTrue(os.path.exists('.bzr-shelf~'))
341
self.assertTrue(os.path.exists('.bzr-shelf-1~'))
342
self.assertTrue(os.path.exists('.bzr-shelf-3~'))
343
self.assertFalse(os.path.exists('.bzr-shelf'))
344
self.assertFalse(os.path.exists('.bzr-shelf-1'))
345
self.assertFalse(os.path.exists('.bzr-shelf-3'))
346
347
# Shelve should work now
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)
354
355
# Run a benign shelf command to setup .shelf for us
356
self.run_bzr('shelf', 'ls', retcode=0)
357
358
# Fake a -p0 shelved patch
359
diff = self.DIFF_1
360
diff = diff.replace('a/', '')
361
diff = diff.replace('b/', '')
362
open('.shelf/shelves/default/00', 'w').write(diff)
363
364
# This should work
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')
Loggerhead is a web-based interface for Breezy
Version: 2.0.1