← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Jelmer Vernooij
  • Date: 2009-04-10 15:58:09 UTC
  • mto: This revision was merged to the branch mainline in revision 4284.
  • Revision ID: jelmer@samba.org-20090410155809-kdibzcjvp7pdb83f
Fix missing import.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
1
 
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
 
1
# Copyright (C) 2008 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
16
16
 
17
17
import os
18
18
 
19
 
from bzrlib import (
20
 
    errors,
21
 
    osutils,
22
 
    pack,
23
 
    shelf,
24
 
    tests,
25
 
    transform,
26
 
    workingtree,
27
 
    )
 
19
from bzrlib import errors, pack, shelf, tests, transform, workingtree
28
20
 
29
21
 
30
22
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
40
32
 
41
33
class TestPrepareShelf(tests.TestCaseWithTransport):
42
34
 
43
 
    def prepare_shelve_rename(self):
 
35
    def test_shelve_rename(self):
44
36
        tree = self.make_branch_and_tree('.')
45
37
        self.build_tree(['foo'])
46
38
        tree.add(['foo'], ['foo-id'])
47
39
        tree.commit('foo')
48
40
        tree.rename_one('foo', 'bar')
49
 
        tree.lock_tree_write()
50
 
        self.addCleanup(tree.unlock)
51
41
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
52
42
        self.addCleanup(creator.finalize)
53
43
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
54
44
                          list(creator.iter_shelvable()))
55
 
        return creator
56
 
 
57
 
    def check_shelve_rename(self, creator):
 
45
        creator.shelve_rename('foo-id')
58
46
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
59
47
        self.assertEqual('foo', creator.work_transform.final_name(
60
48
                         work_trans_id))
62
50
        self.assertEqual('bar', creator.shelf_transform.final_name(
63
51
                         shelf_trans_id))
64
52
 
65
 
    def test_shelve_rename(self):
66
 
        creator = self.prepare_shelve_rename()
67
 
        creator.shelve_rename('foo-id')
68
 
        self.check_shelve_rename(creator)
69
 
 
70
 
    def test_shelve_change_handles_rename(self):
71
 
        creator = self.prepare_shelve_rename()
72
 
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
73
 
        self.check_shelve_rename(creator)
74
 
 
75
 
    def prepare_shelve_move(self):
 
53
    def test_shelve_move(self):
76
54
        tree = self.make_branch_and_tree('.')
77
55
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
78
56
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
79
57
        tree.commit('foo')
80
58
        tree.rename_one('foo/baz', 'bar/baz')
81
 
        tree.lock_tree_write()
82
 
        self.addCleanup(tree.unlock)
83
59
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
84
60
        self.addCleanup(creator.finalize)
85
61
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
86
62
                         list(creator.iter_shelvable()))
87
 
        return creator, tree
88
 
 
89
 
    def check_shelve_move(self, creator, tree):
 
63
        creator.shelve_rename('baz-id')
90
64
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
91
65
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
92
66
        self.assertEqual(work_foo, creator.work_transform.final_parent(
98
72
        creator.transform()
99
73
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
100
74
 
101
 
    def test_shelve_move(self):
102
 
        creator, tree = self.prepare_shelve_move()
103
 
        creator.shelve_rename('baz-id')
104
 
        self.check_shelve_move(creator, tree)
105
 
 
106
 
    def test_shelve_change_handles_move(self):
107
 
        creator, tree = self.prepare_shelve_move()
108
 
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
109
 
        self.check_shelve_move(creator, tree)
110
 
 
111
 
    def test_shelve_changed_root_id(self):
112
 
        tree = self.make_branch_and_tree('.')
113
 
        self.build_tree(['foo'])
114
 
        tree.set_root_id('first-root-id')
115
 
        tree.add(['foo'], ['foo-id'])
116
 
        tree.commit('foo')
117
 
        tree.set_root_id('second-root-id')
118
 
        tree.lock_tree_write()
119
 
        self.addCleanup(tree.unlock)
120
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
121
 
        self.addCleanup(creator.finalize)
122
 
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
123
 
            self.assertEqual, [
124
 
                ('delete file', 'first-root-id', 'directory', ''),
125
 
                ('add file', 'second-root-id', 'directory', ''),
126
 
                ('rename', 'foo-id', u'foo', u'foo'),
127
 
                ], list(creator.iter_shelvable()))
128
 
 
129
 
        self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
130
 
                          ('add file', 'second-root-id', 'directory', ''),
131
 
                          ('rename', 'foo-id', u'foo', u'foo'),
132
 
                         ], list(creator.iter_shelvable()))
133
 
 
134
75
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
135
76
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
136
77
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
137
78
        self.assertFileEqual(expected_content, shelf_file)
138
79
 
139
 
    def prepare_content_change(self):
 
80
    def test_shelve_content_change(self):
140
81
        tree = self.make_branch_and_tree('.')
141
82
        tree.lock_write()
142
83
        self.addCleanup(tree.unlock)
146
87
        self.build_tree_contents([('foo', 'b\na\nc\n')])
147
88
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
148
89
        self.addCleanup(creator.finalize)
149
 
        return creator
150
 
 
151
 
    def test_shelve_content_change(self):
152
 
        creator = self.prepare_content_change()
153
90
        self.assertEqual([('modify text', 'foo-id')],
154
91
                         list(creator.iter_shelvable()))
155
92
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
157
94
        self.assertFileEqual('a\nc\n', 'foo')
158
95
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
159
96
 
160
 
    def test_shelve_change_handles_modify_text(self):
161
 
        creator = self.prepare_content_change()
162
 
        creator.shelve_change(('modify text', 'foo-id'))
163
 
        creator.transform()
164
 
        self.assertFileEqual('a\n', 'foo')
165
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
166
 
 
167
 
    def test_shelve_all(self):
168
 
        creator = self.prepare_content_change()
169
 
        creator.shelve_all()
170
 
        creator.transform()
171
 
        self.assertFileEqual('a\n', 'foo')
172
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
173
 
 
174
 
    def prepare_shelve_creation(self):
 
97
    def test_shelve_creation(self):
175
98
        tree = self.make_branch_and_tree('.')
176
99
        tree.lock_write()
177
100
        self.addCleanup(tree.unlock)
183
106
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
184
107
                          ('add file', 'foo-id', 'file', 'foo')],
185
108
                          sorted(list(creator.iter_shelvable())))
186
 
        return creator, tree
187
 
 
188
 
    def check_shelve_creation(self, creator, tree):
 
109
        creator.shelve_creation('foo-id')
 
110
        creator.shelve_creation('bar-id')
 
111
        creator.transform()
189
112
        self.assertRaises(StopIteration,
190
113
                          tree.iter_entries_by_dir(['foo-id']).next)
191
114
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
198
121
        self.assertEqual('directory',
199
122
            creator.shelf_transform.final_kind(s_bar_trans_id))
200
123
 
201
 
    def test_shelve_creation(self):
202
 
        creator, tree = self.prepare_shelve_creation()
203
 
        creator.shelve_creation('foo-id')
204
 
        creator.shelve_creation('bar-id')
205
 
        creator.transform()
206
 
        self.check_shelve_creation(creator, tree)
207
 
 
208
 
    def test_shelve_change_handles_creation(self):
209
 
        creator, tree = self.prepare_shelve_creation()
210
 
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
211
 
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
212
 
        creator.transform()
213
 
        self.check_shelve_creation(creator, tree)
214
 
 
215
 
    def _test_shelve_symlink_creation(self, link_name, link_target,
216
 
                                      shelve_change=False):
217
 
        self.requireFeature(tests.SymlinkFeature)
218
 
        tree = self.make_branch_and_tree('.')
219
 
        tree.lock_write()
220
 
        self.addCleanup(tree.unlock)
221
 
        tree.commit('Empty tree')
222
 
        os.symlink(link_target, link_name)
223
 
        tree.add(link_name, 'foo-id')
224
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
225
 
        self.addCleanup(creator.finalize)
226
 
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
227
 
                         list(creator.iter_shelvable()))
228
 
        if shelve_change:
229
 
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
230
 
        else:
231
 
            creator.shelve_creation('foo-id')
232
 
        creator.transform()
233
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
234
 
        self.failIfExists(link_name)
235
 
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
236
 
        self.assertEqual(link_target, osutils.readlink(limbo_name))
237
 
        ptree = creator.shelf_transform.get_preview_tree()
238
 
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
239
 
 
240
124
    def test_shelve_symlink_creation(self):
241
 
        self._test_shelve_symlink_creation('foo', 'bar')
242
 
 
243
 
    def test_shelve_unicode_symlink_creation(self):
244
 
        self.requireFeature(tests.UnicodeFilenameFeature)
245
 
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
246
 
                                           u'b\N{Euro Sign}ar')
247
 
 
248
 
    def test_shelve_change_handles_symlink_creation(self):
249
 
        self._test_shelve_symlink_creation('foo', 'bar', shelve_change=True)
250
 
 
251
 
    def _test_shelve_symlink_target_change(self, link_name,
252
 
                                           old_target, new_target,
253
 
                                           shelve_change=False):
254
 
        self.requireFeature(tests.SymlinkFeature)
255
 
        tree = self.make_branch_and_tree('.')
256
 
        tree.lock_write()
257
 
        self.addCleanup(tree.unlock)
258
 
        os.symlink(old_target, link_name)
259
 
        tree.add(link_name, 'foo-id')
 
125
        self.requireFeature(tests.SymlinkFeature)
 
126
        tree = self.make_branch_and_tree('.')
 
127
        tree.lock_write()
 
128
        self.addCleanup(tree.unlock)
 
129
        tree.commit('Empty tree')
 
130
        os.symlink('bar', 'foo')
 
131
        tree.add('foo', 'foo-id')
 
132
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
133
        self.addCleanup(creator.finalize)
 
134
        self.assertEqual([('add file', 'foo-id', 'symlink', 'foo')],
 
135
                         list(creator.iter_shelvable()))
 
136
        creator.shelve_creation('foo-id')
 
137
        creator.transform()
 
138
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
139
        self.failIfExists('foo')
 
140
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
 
141
        self.assertEqual('bar', os.readlink(limbo_name))
 
142
 
 
143
    def test_shelve_symlink_target_change(self):
 
144
        self.requireFeature(tests.SymlinkFeature)
 
145
        tree = self.make_branch_and_tree('.')
 
146
        tree.lock_write()
 
147
        self.addCleanup(tree.unlock)
 
148
        os.symlink('bar', 'foo')
 
149
        tree.add('foo', 'foo-id')
260
150
        tree.commit("commit symlink")
261
 
        os.unlink(link_name)
262
 
        os.symlink(new_target, link_name)
 
151
        os.unlink("foo")
 
152
        os.symlink('baz', 'foo')
263
153
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
264
154
        self.addCleanup(creator.finalize)
265
 
        self.assertEqual([('modify target', 'foo-id', link_name,
266
 
                           old_target, new_target)],
 
155
        self.assertEqual([('modify target', 'foo-id', 'foo', 'bar', 'baz')],
267
156
                         list(creator.iter_shelvable()))
268
 
        if shelve_change:
269
 
            creator.shelve_change(('modify target', 'foo-id', link_name,
270
 
                                   old_target, new_target))
271
 
        else:
272
 
            creator.shelve_modify_target('foo-id')
 
157
        creator.shelve_modify_target('foo-id')
273
158
        creator.transform()
274
 
        self.assertEqual(old_target, osutils.readlink(link_name))
 
159
        self.assertEqual('bar', os.readlink('foo'))
275
160
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
276
161
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
277
 
        self.assertEqual(new_target, osutils.readlink(limbo_name))
278
 
        ptree = creator.shelf_transform.get_preview_tree()
279
 
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
280
 
 
281
 
    def test_shelve_symlink_target_change(self):
282
 
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
283
 
 
284
 
    def test_shelve_unicode_symlink_target_change(self):
285
 
        self.requireFeature(tests.UnicodeFilenameFeature)
286
 
        self._test_shelve_symlink_target_change(
287
 
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
288
 
 
289
 
    def test_shelve_change_handles_symlink_target_change(self):
290
 
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz',
291
 
                                                shelve_change=True)
 
162
        self.assertEqual('baz', os.readlink(limbo_name))
292
163
 
293
164
    def test_shelve_creation_no_contents(self):
294
165
        tree = self.make_branch_and_tree('.')
312
183
                         creator.shelf_transform.final_file_id(s_trans_id))
313
184
        self.failIfExists('foo')
314
185
 
315
 
    def prepare_shelve_deletion(self):
 
186
    def test_shelve_deletion(self):
316
187
        tree = self.make_branch_and_tree('tree')
317
188
        tree.lock_write()
318
189
        self.addCleanup(tree.unlock)
327
198
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
328
199
                          ('delete file', 'foo-id', 'directory', 'foo')],
329
200
                          sorted(list(creator.iter_shelvable())))
330
 
        return creator, tree
331
 
 
332
 
    def check_shelve_deletion(self, tree):
 
201
        creator.shelve_deletion('foo-id')
 
202
        creator.shelve_deletion('bar-id')
 
203
        creator.transform()
333
204
        self.assertTrue('foo-id' in tree)
334
205
        self.assertTrue('bar-id' in tree)
335
206
        self.assertFileEqual('baz', 'tree/foo/bar')
336
207
 
337
 
    def test_shelve_deletion(self):
338
 
        creator, tree = self.prepare_shelve_deletion()
339
 
        creator.shelve_deletion('foo-id')
340
 
        creator.shelve_deletion('bar-id')
341
 
        creator.transform()
342
 
        self.check_shelve_deletion(tree)
343
 
 
344
 
    def test_shelve_change_handles_deletion(self):
345
 
        creator, tree = self.prepare_shelve_deletion()
346
 
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
347
 
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
348
 
        creator.transform()
349
 
        self.check_shelve_deletion(tree)
350
 
 
351
208
    def test_shelve_delete_contents(self):
352
209
        tree = self.make_branch_and_tree('tree')
353
210
        self.build_tree(['tree/foo',])
354
211
        tree.add('foo', 'foo-id')
355
212
        tree.commit('Added file and directory')
356
213
        os.unlink('tree/foo')
357
 
        tree.lock_tree_write()
358
 
        self.addCleanup(tree.unlock)
359
214
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
360
215
        self.addCleanup(creator.finalize)
361
216
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
364
219
        creator.transform()
365
220
        self.failUnlessExists('tree/foo')
366
221
 
367
 
    def prepare_shelve_change_kind(self):
 
222
    def test_shelve_change_kind(self):
368
223
        tree = self.make_branch_and_tree('tree')
369
224
        self.build_tree_contents([('tree/foo', 'bar')])
370
225
        tree.add('foo', 'foo-id')
371
226
        tree.commit('Added file and directory')
372
227
        os.unlink('tree/foo')
373
228
        os.mkdir('tree/foo')
374
 
        tree.lock_tree_write()
375
 
        self.addCleanup(tree.unlock)
376
229
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
377
230
        self.addCleanup(creator.finalize)
378
231
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
379
232
                           'foo')], sorted(list(creator.iter_shelvable())))
380
 
        return creator
381
 
 
382
 
    def check_shelve_change_kind(self, creator):
 
233
        creator.shelve_content_change('foo-id')
 
234
        creator.transform()
383
235
        self.assertFileEqual('bar', 'tree/foo')
384
236
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
385
237
        self.assertEqual('directory',
386
238
                         creator.shelf_transform._new_contents[s_trans_id])
387
239
 
388
 
    def test_shelve_change_kind(self):
389
 
        creator = self.prepare_shelve_change_kind()
390
 
        creator.shelve_content_change('foo-id')
391
 
        creator.transform()
392
 
        self.check_shelve_change_kind(creator)
393
 
 
394
 
    def test_shelve_change_handles_change_kind(self):
395
 
        creator = self.prepare_shelve_change_kind()
396
 
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
397
 
                               'foo'))
398
 
        creator.transform()
399
 
        self.check_shelve_change_kind(creator)
400
 
 
401
 
    def test_shelve_change_unknown_change(self):
402
 
        tree = self.make_branch_and_tree('tree')
403
 
        tree.lock_tree_write()
404
 
        self.addCleanup(tree.unlock)
405
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
406
 
        self.addCleanup(creator.finalize)
407
 
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
408
 
        self.assertEqual('Unknown change kind: "unknown"', str(e))
409
 
 
410
240
    def test_shelve_unversion(self):
411
241
        tree = self.make_branch_and_tree('tree')
412
242
        self.build_tree(['tree/foo',])
413
243
        tree.add('foo', 'foo-id')
414
244
        tree.commit('Added file and directory')
415
245
        tree.unversion(['foo-id'])
416
 
        tree.lock_tree_write()
417
 
        self.addCleanup(tree.unlock)
418
246
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
419
247
        self.addCleanup(creator.finalize)
420
248
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
425
253
 
426
254
    def test_shelve_serialization(self):
427
255
        tree = self.make_branch_and_tree('.')
428
 
        tree.lock_tree_write()
429
 
        self.addCleanup(tree.unlock)
430
256
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
431
257
        self.addCleanup(creator.finalize)
432
258
        shelf_file = open('shelf', 'wb')
441
267
        tree = self.make_branch_and_tree('tree')
442
268
        self.build_tree(['tree/foo'])
443
269
        tree.add('foo', 'foo-id')
444
 
        tree.lock_tree_write()
445
 
        self.addCleanup(tree.unlock)
446
270
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
447
271
        self.addCleanup(creator.finalize)
448
272
        list(creator.iter_shelvable())
467
291
 
468
292
    def test_shelve_unversioned(self):
469
293
        tree = self.make_branch_and_tree('tree')
470
 
        tree.lock_tree_write()
471
 
        try:
472
 
            self.assertRaises(errors.PathsNotVersionedError,
473
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
474
 
        finally:
475
 
            tree.unlock()
 
294
        self.assertRaises(errors.PathsNotVersionedError,
 
295
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
476
296
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
477
297
        # after itself.
478
298
        wt = workingtree.WorkingTree.open('tree')
480
300
        wt.unlock()
481
301
        # And a second tentative should raise the same error (no
482
302
        # limbo/pending_deletion leftovers).
483
 
        tree.lock_tree_write()
484
 
        try:
485
 
            self.assertRaises(errors.PathsNotVersionedError,
486
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
487
 
        finally:
488
 
            tree.unlock()
489
 
 
490
 
    def test_shelve_skips_added_root(self):
491
 
        """Skip adds of the root when iterating through shelvable changes."""
492
 
        tree = self.make_branch_and_tree('tree')
493
 
        tree.lock_tree_write()
494
 
        self.addCleanup(tree.unlock)
495
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
496
 
        self.addCleanup(creator.finalize)
497
 
        self.assertEqual([], list(creator.iter_shelvable()))
498
 
 
499
 
    def test_shelve_skips_added_root(self):
500
 
        """Skip adds of the root when iterating through shelvable changes."""
501
 
        tree = self.make_branch_and_tree('tree')
502
 
        tree.lock_tree_write()
503
 
        self.addCleanup(tree.unlock)
504
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
505
 
        self.addCleanup(creator.finalize)
506
 
        self.assertEqual([], list(creator.iter_shelvable()))
 
303
        self.assertRaises(errors.PathsNotVersionedError,
 
304
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
507
305
 
508
306
 
509
307
class TestUnshelver(tests.TestCaseWithTransport):
526
324
            shelf_file.seek(0)
527
325
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
528
326
            unshelver.make_merger().do_merge()
529
 
            self.addCleanup(unshelver.finalize)
530
327
            self.assertFileEqual('bar', 'tree/foo')
531
328
        finally:
532
329
            shelf_file.close()
550
347
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
551
348
        shelf_file.seek(0)
552
349
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
553
 
        self.addCleanup(unshelver.finalize)
554
350
        unshelver.make_merger().do_merge()
555
351
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
556
352
 
579
375
        self.assertFileEqual('baz', 'tree/foo/bar')
580
376
        shelf_file.seek(0)
581
377
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
582
 
        self.addCleanup(unshelver.finalize)
583
378
        unshelver.make_merger().do_merge()
584
379
        self.assertFalse('foo-id' in tree)
585
380
        self.assertFalse('bar-id' in tree)
610
405
        shelf_file = open('shelf', 'rb')
611
406
        self.addCleanup(shelf_file.close)
612
407
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
613
 
        unshelver.finalize()
614
408
 
615
409
    def test_corrupt_shelf(self):
616
410
        tree = self.make_branch_and_tree('.')
725
519
        shelf_id = shelf_manager.shelve_changes(creator)
726
520
        self.failIfExists('tree/foo')
727
521
        unshelver = shelf_manager.get_unshelver(shelf_id)
728
 
        self.addCleanup(unshelver.finalize)
729
522
        unshelver.make_merger().do_merge()
730
523
        self.assertFileEqual('bar', 'tree/foo')
731
524
 
732
525
    def test_get_metadata(self):
733
526
        tree = self.make_branch_and_tree('.')
734
 
        tree.lock_tree_write()
735
 
        self.addCleanup(tree.unlock)
736
527
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
737
 
        self.addCleanup(creator.finalize)
738
528
        shelf_manager = tree.get_shelf_manager()
739
529
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
740
530
        metadata = shelf_manager.get_metadata(shelf_id)