← 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: Ian Clatworthy
  • Date: 2008-12-15 04:37:10 UTC
  • mfrom: (3892.1.6 bzr.help-formats)
  • mto: This revision was merged to the branch mainline in revision 3905.
  • Revision ID: ian.clatworthy@canonical.com-20081215043710-ybhxvqjeir13k5ht
Improved help on storage formats (Ian Clatworthy)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
1
 
# Copyright (C) 2008-2011 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
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
 
    )
28
 
from bzrlib.tests import (
29
 
    features,
30
 
    )
 
19
from bzrlib import errors, pack, shelf, tests, transform
31
20
 
32
21
 
33
22
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
43
32
 
44
33
class TestPrepareShelf(tests.TestCaseWithTransport):
45
34
 
46
 
    def prepare_shelve_rename(self):
 
35
    def test_shelve_rename(self):
47
36
        tree = self.make_branch_and_tree('.')
48
37
        self.build_tree(['foo'])
49
38
        tree.add(['foo'], ['foo-id'])
50
39
        tree.commit('foo')
51
40
        tree.rename_one('foo', 'bar')
52
 
        tree.lock_tree_write()
53
 
        self.addCleanup(tree.unlock)
54
41
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
55
42
        self.addCleanup(creator.finalize)
56
43
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
57
44
                          list(creator.iter_shelvable()))
58
 
        return creator
59
 
 
60
 
    def check_shelve_rename(self, creator):
 
45
        creator.shelve_rename('foo-id')
61
46
        work_trans_id = creator.work_transform.trans_id_file_id('foo-id')
62
47
        self.assertEqual('foo', creator.work_transform.final_name(
63
48
                         work_trans_id))
65
50
        self.assertEqual('bar', creator.shelf_transform.final_name(
66
51
                         shelf_trans_id))
67
52
 
68
 
    def test_shelve_rename(self):
69
 
        creator = self.prepare_shelve_rename()
70
 
        creator.shelve_rename('foo-id')
71
 
        self.check_shelve_rename(creator)
72
 
 
73
 
    def test_shelve_change_handles_rename(self):
74
 
        creator = self.prepare_shelve_rename()
75
 
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
76
 
        self.check_shelve_rename(creator)
77
 
 
78
 
    def prepare_shelve_move(self):
 
53
    def test_shelve_move(self):
79
54
        tree = self.make_branch_and_tree('.')
80
55
        self.build_tree(['foo/', 'bar/', 'foo/baz'])
81
56
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
82
57
        tree.commit('foo')
83
58
        tree.rename_one('foo/baz', 'bar/baz')
84
 
        tree.lock_tree_write()
85
 
        self.addCleanup(tree.unlock)
86
59
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
87
60
        self.addCleanup(creator.finalize)
88
61
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
89
62
                         list(creator.iter_shelvable()))
90
 
        return creator, tree
91
 
 
92
 
    def check_shelve_move(self, creator, tree):
 
63
        creator.shelve_rename('baz-id')
93
64
        work_trans_id = creator.work_transform.trans_id_file_id('baz-id')
94
65
        work_foo = creator.work_transform.trans_id_file_id('foo-id')
95
66
        self.assertEqual(work_foo, creator.work_transform.final_parent(
101
72
        creator.transform()
102
73
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
103
74
 
104
 
    def test_shelve_move(self):
105
 
        creator, tree = self.prepare_shelve_move()
106
 
        creator.shelve_rename('baz-id')
107
 
        self.check_shelve_move(creator, tree)
108
 
 
109
 
    def test_shelve_change_handles_move(self):
110
 
        creator, tree = self.prepare_shelve_move()
111
 
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
112
 
        self.check_shelve_move(creator, tree)
113
 
 
114
 
    def test_shelve_changed_root_id(self):
115
 
        tree = self.make_branch_and_tree('.')
116
 
        self.build_tree(['foo'])
117
 
        tree.set_root_id('first-root-id')
118
 
        tree.add(['foo'], ['foo-id'])
119
 
        tree.commit('foo')
120
 
        tree.set_root_id('second-root-id')
121
 
        tree.lock_tree_write()
122
 
        self.addCleanup(tree.unlock)
123
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
124
 
        self.addCleanup(creator.finalize)
125
 
        self.expectFailure('shelf doesn\'t support shelving root changes yet',
126
 
            self.assertEqual, [
127
 
                ('delete file', 'first-root-id', 'directory', ''),
128
 
                ('add file', 'second-root-id', 'directory', ''),
129
 
                ('rename', 'foo-id', u'foo', u'foo'),
130
 
                ], list(creator.iter_shelvable()))
131
 
 
132
 
        self.assertEqual([('delete file', 'first-root-id', 'directory', ''),
133
 
                          ('add file', 'second-root-id', 'directory', ''),
134
 
                          ('rename', 'foo-id', u'foo', u'foo'),
135
 
                         ], list(creator.iter_shelvable()))
136
 
 
137
75
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
138
76
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
139
77
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
140
78
        self.assertFileEqual(expected_content, shelf_file)
141
79
 
142
 
    def prepare_content_change(self):
 
80
    def test_shelve_content_change(self):
143
81
        tree = self.make_branch_and_tree('.')
144
82
        tree.lock_write()
145
83
        self.addCleanup(tree.unlock)
149
87
        self.build_tree_contents([('foo', 'b\na\nc\n')])
150
88
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
151
89
        self.addCleanup(creator.finalize)
152
 
        return creator
153
 
 
154
 
    def test_shelve_content_change(self):
155
 
        creator = self.prepare_content_change()
156
90
        self.assertEqual([('modify text', 'foo-id')],
157
91
                         list(creator.iter_shelvable()))
158
92
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
160
94
        self.assertFileEqual('a\nc\n', 'foo')
161
95
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
162
96
 
163
 
    def test_shelve_change_handles_modify_text(self):
164
 
        creator = self.prepare_content_change()
165
 
        creator.shelve_change(('modify text', 'foo-id'))
166
 
        creator.transform()
167
 
        self.assertFileEqual('a\n', 'foo')
168
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
169
 
 
170
 
    def test_shelve_all(self):
171
 
        creator = self.prepare_content_change()
172
 
        creator.shelve_all()
173
 
        creator.transform()
174
 
        self.assertFileEqual('a\n', 'foo')
175
 
        self.assertShelvedFileEqual('b\na\nc\n', creator, 'foo-id')
176
 
 
177
 
    def prepare_shelve_creation(self):
 
97
    def test_shelve_creation(self):
178
98
        tree = self.make_branch_and_tree('.')
179
99
        tree.lock_write()
180
100
        self.addCleanup(tree.unlock)
186
106
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
187
107
                          ('add file', 'foo-id', 'file', 'foo')],
188
108
                          sorted(list(creator.iter_shelvable())))
189
 
        return creator, tree
190
 
 
191
 
    def check_shelve_creation(self, creator, tree):
 
109
        creator.shelve_creation('foo-id')
 
110
        creator.shelve_creation('bar-id')
 
111
        creator.transform()
192
112
        self.assertRaises(StopIteration,
193
113
                          tree.iter_entries_by_dir(['foo-id']).next)
194
114
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
195
115
        self.assertEqual('foo-id',
196
116
                         creator.shelf_transform.final_file_id(s_trans_id))
197
 
        self.assertPathDoesNotExist('foo')
198
 
        self.assertPathDoesNotExist('bar')
 
117
        self.failIfExists('foo')
 
118
        self.failIfExists('bar')
199
119
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
200
120
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
201
121
        self.assertEqual('directory',
202
122
            creator.shelf_transform.final_kind(s_bar_trans_id))
203
123
 
204
 
    def test_shelve_creation(self):
205
 
        creator, tree = self.prepare_shelve_creation()
206
 
        creator.shelve_creation('foo-id')
207
 
        creator.shelve_creation('bar-id')
208
 
        creator.transform()
209
 
        self.check_shelve_creation(creator, tree)
210
 
 
211
 
    def test_shelve_change_handles_creation(self):
212
 
        creator, tree = self.prepare_shelve_creation()
213
 
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
214
 
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
215
 
        creator.transform()
216
 
        self.check_shelve_creation(creator, tree)
217
 
 
218
 
    def _test_shelve_symlink_creation(self, link_name, link_target,
219
 
                                      shelve_change=False):
220
 
        self.requireFeature(features.SymlinkFeature)
221
 
        tree = self.make_branch_and_tree('.')
222
 
        tree.lock_write()
223
 
        self.addCleanup(tree.unlock)
224
 
        tree.commit('Empty tree')
225
 
        os.symlink(link_target, link_name)
226
 
        tree.add(link_name, 'foo-id')
227
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
228
 
        self.addCleanup(creator.finalize)
229
 
        self.assertEqual([('add file', 'foo-id', 'symlink', link_name)],
230
 
                         list(creator.iter_shelvable()))
231
 
        if shelve_change:
232
 
            creator.shelve_change(('add file', 'foo-id', 'symlink', link_name))
233
 
        else:
234
 
            creator.shelve_creation('foo-id')
235
 
        creator.transform()
236
 
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
237
 
        self.assertPathDoesNotExist(link_name)
238
 
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
239
 
        self.assertEqual(link_target, osutils.readlink(limbo_name))
240
 
        ptree = creator.shelf_transform.get_preview_tree()
241
 
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
242
 
 
243
124
    def test_shelve_symlink_creation(self):
244
 
        self._test_shelve_symlink_creation('foo', 'bar')
245
 
 
246
 
    def test_shelve_unicode_symlink_creation(self):
247
 
        self.requireFeature(features.UnicodeFilenameFeature)
248
 
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
249
 
                                           u'b\N{Euro Sign}ar')
250
 
 
251
 
    def test_shelve_change_handles_symlink_creation(self):
252
 
        self._test_shelve_symlink_creation('foo', 'bar', shelve_change=True)
253
 
 
254
 
    def _test_shelve_symlink_target_change(self, link_name,
255
 
                                           old_target, new_target,
256
 
                                           shelve_change=False):
257
 
        self.requireFeature(features.SymlinkFeature)
 
125
        self.requireFeature(tests.SymlinkFeature)
258
126
        tree = self.make_branch_and_tree('.')
259
127
        tree.lock_write()
260
128
        self.addCleanup(tree.unlock)
261
 
        os.symlink(old_target, link_name)
262
 
        tree.add(link_name, 'foo-id')
263
 
        tree.commit("commit symlink")
264
 
        os.unlink(link_name)
265
 
        os.symlink(new_target, link_name)
 
129
        tree.commit('Empty tree')
 
130
        os.symlink('bar', 'foo')
 
131
        tree.add('foo', 'foo-id')
266
132
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
267
133
        self.addCleanup(creator.finalize)
268
 
        self.assertEqual([('modify target', 'foo-id', link_name,
269
 
                           old_target, new_target)],
 
134
        self.assertEqual([('add file', 'foo-id', 'symlink', 'foo')],
270
135
                         list(creator.iter_shelvable()))
271
 
        if shelve_change:
272
 
            creator.shelve_change(('modify target', 'foo-id', link_name,
273
 
                                   old_target, new_target))
274
 
        else:
275
 
            creator.shelve_modify_target('foo-id')
 
136
        creator.shelve_creation('foo-id')
276
137
        creator.transform()
277
 
        self.assertEqual(old_target, osutils.readlink(link_name))
278
138
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
139
        self.failIfExists('foo')
279
140
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
280
 
        self.assertEqual(new_target, osutils.readlink(limbo_name))
281
 
        ptree = creator.shelf_transform.get_preview_tree()
282
 
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
283
 
 
284
 
    def test_shelve_symlink_target_change(self):
285
 
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
286
 
 
287
 
    def test_shelve_unicode_symlink_target_change(self):
288
 
        self.requireFeature(features.UnicodeFilenameFeature)
289
 
        self._test_shelve_symlink_target_change(
290
 
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
291
 
 
292
 
    def test_shelve_change_handles_symlink_target_change(self):
293
 
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz',
294
 
                                                shelve_change=True)
 
141
        self.assertEqual('bar', os.readlink(limbo_name))
295
142
 
296
143
    def test_shelve_creation_no_contents(self):
297
144
        tree = self.make_branch_and_tree('.')
313
160
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
314
161
        self.assertEqual('foo-id',
315
162
                         creator.shelf_transform.final_file_id(s_trans_id))
316
 
        self.assertPathDoesNotExist('foo')
 
163
        self.failIfExists('foo')
317
164
 
318
 
    def prepare_shelve_deletion(self):
 
165
    def test_shelve_deletion(self):
319
166
        tree = self.make_branch_and_tree('tree')
320
167
        tree.lock_write()
321
168
        self.addCleanup(tree.unlock)
330
177
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
331
178
                          ('delete file', 'foo-id', 'directory', 'foo')],
332
179
                          sorted(list(creator.iter_shelvable())))
333
 
        return creator, tree
334
 
 
335
 
    def check_shelve_deletion(self, tree):
336
 
        self.assertTrue(tree.has_id('foo-id'))
337
 
        self.assertTrue(tree.has_id('bar-id'))
338
 
        self.assertFileEqual('baz', 'tree/foo/bar')
339
 
 
340
 
    def test_shelve_deletion(self):
341
 
        creator, tree = self.prepare_shelve_deletion()
342
180
        creator.shelve_deletion('foo-id')
343
181
        creator.shelve_deletion('bar-id')
344
182
        creator.transform()
345
 
        self.check_shelve_deletion(tree)
346
 
 
347
 
    def test_shelve_change_handles_deletion(self):
348
 
        creator, tree = self.prepare_shelve_deletion()
349
 
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
350
 
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
351
 
        creator.transform()
352
 
        self.check_shelve_deletion(tree)
 
183
        self.assertTrue('foo-id' in tree)
 
184
        self.assertTrue('bar-id' in tree)
 
185
        self.assertFileEqual('baz', 'tree/foo/bar')
353
186
 
354
187
    def test_shelve_delete_contents(self):
355
188
        tree = self.make_branch_and_tree('tree')
357
190
        tree.add('foo', 'foo-id')
358
191
        tree.commit('Added file and directory')
359
192
        os.unlink('tree/foo')
360
 
        tree.lock_tree_write()
361
 
        self.addCleanup(tree.unlock)
362
193
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
363
194
        self.addCleanup(creator.finalize)
364
195
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
365
196
                         sorted(list(creator.iter_shelvable())))
366
197
        creator.shelve_deletion('foo-id')
367
198
        creator.transform()
368
 
        self.assertPathExists('tree/foo')
 
199
        self.failUnlessExists('tree/foo')
369
200
 
370
 
    def prepare_shelve_change_kind(self):
 
201
    def test_shelve_change_kind(self):
371
202
        tree = self.make_branch_and_tree('tree')
372
203
        self.build_tree_contents([('tree/foo', 'bar')])
373
204
        tree.add('foo', 'foo-id')
374
205
        tree.commit('Added file and directory')
375
206
        os.unlink('tree/foo')
376
207
        os.mkdir('tree/foo')
377
 
        tree.lock_tree_write()
378
 
        self.addCleanup(tree.unlock)
379
208
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
380
209
        self.addCleanup(creator.finalize)
381
210
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
382
211
                           'foo')], sorted(list(creator.iter_shelvable())))
383
 
        return creator
384
 
 
385
 
    def check_shelve_change_kind(self, creator):
 
212
        creator.shelve_content_change('foo-id')
 
213
        creator.transform()
386
214
        self.assertFileEqual('bar', 'tree/foo')
387
215
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
388
216
        self.assertEqual('directory',
389
217
                         creator.shelf_transform._new_contents[s_trans_id])
390
218
 
391
 
    def test_shelve_change_kind(self):
392
 
        creator = self.prepare_shelve_change_kind()
393
 
        creator.shelve_content_change('foo-id')
394
 
        creator.transform()
395
 
        self.check_shelve_change_kind(creator)
396
 
 
397
 
    def test_shelve_change_handles_change_kind(self):
398
 
        creator = self.prepare_shelve_change_kind()
399
 
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
400
 
                               'foo'))
401
 
        creator.transform()
402
 
        self.check_shelve_change_kind(creator)
403
 
 
404
 
    def test_shelve_change_unknown_change(self):
405
 
        tree = self.make_branch_and_tree('tree')
406
 
        tree.lock_tree_write()
407
 
        self.addCleanup(tree.unlock)
408
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
409
 
        self.addCleanup(creator.finalize)
410
 
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
411
 
        self.assertEqual('Unknown change kind: "unknown"', str(e))
412
 
 
413
219
    def test_shelve_unversion(self):
414
220
        tree = self.make_branch_and_tree('tree')
415
221
        self.build_tree(['tree/foo',])
416
222
        tree.add('foo', 'foo-id')
417
223
        tree.commit('Added file and directory')
418
224
        tree.unversion(['foo-id'])
419
 
        tree.lock_tree_write()
420
 
        self.addCleanup(tree.unlock)
421
225
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
422
226
        self.addCleanup(creator.finalize)
423
227
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
424
228
                         sorted(list(creator.iter_shelvable())))
425
229
        creator.shelve_deletion('foo-id')
426
230
        creator.transform()
427
 
        self.assertPathExists('tree/foo')
 
231
        self.failUnlessExists('tree/foo')
428
232
 
429
233
    def test_shelve_serialization(self):
430
234
        tree = self.make_branch_and_tree('.')
431
 
        tree.lock_tree_write()
432
 
        self.addCleanup(tree.unlock)
433
235
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
434
236
        self.addCleanup(creator.finalize)
435
237
        shelf_file = open('shelf', 'wb')
444
246
        tree = self.make_branch_and_tree('tree')
445
247
        self.build_tree(['tree/foo'])
446
248
        tree.add('foo', 'foo-id')
447
 
        tree.lock_tree_write()
448
 
        self.addCleanup(tree.unlock)
449
249
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
450
250
        self.addCleanup(creator.finalize)
451
251
        list(creator.iter_shelvable())
468
268
        records.next()
469
269
        tt.deserialize(records)
470
270
 
471
 
    def test_shelve_unversioned(self):
472
 
        tree = self.make_branch_and_tree('tree')
473
 
        tree.lock_tree_write()
474
 
        try:
475
 
            self.assertRaises(errors.PathsNotVersionedError,
476
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
477
 
        finally:
478
 
            tree.unlock()
479
 
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
480
 
        # after itself.
481
 
        wt = workingtree.WorkingTree.open('tree')
482
 
        wt.lock_tree_write()
483
 
        wt.unlock()
484
 
        # And a second tentative should raise the same error (no
485
 
        # limbo/pending_deletion leftovers).
486
 
        tree.lock_tree_write()
487
 
        try:
488
 
            self.assertRaises(errors.PathsNotVersionedError,
489
 
                              shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
490
 
        finally:
491
 
            tree.unlock()
492
 
 
493
 
    def test_shelve_skips_added_root(self):
494
 
        """Skip adds of the root when iterating through shelvable changes."""
495
 
        tree = self.make_branch_and_tree('tree')
496
 
        tree.lock_tree_write()
497
 
        self.addCleanup(tree.unlock)
498
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
499
 
        self.addCleanup(creator.finalize)
500
 
        self.assertEqual([], list(creator.iter_shelvable()))
501
 
 
502
 
    def test_shelve_skips_added_root(self):
503
 
        """Skip adds of the root when iterating through shelvable changes."""
504
 
        tree = self.make_branch_and_tree('tree')
505
 
        tree.lock_tree_write()
506
 
        self.addCleanup(tree.unlock)
507
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
508
 
        self.addCleanup(creator.finalize)
509
 
        self.assertEqual([], list(creator.iter_shelvable()))
510
 
 
511
271
 
512
272
class TestUnshelver(tests.TestCaseWithTransport):
513
273
 
529
289
            shelf_file.seek(0)
530
290
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
531
291
            unshelver.make_merger().do_merge()
532
 
            self.addCleanup(unshelver.finalize)
533
292
            self.assertFileEqual('bar', 'tree/foo')
534
293
        finally:
535
294
            shelf_file.close()
553
312
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
554
313
        shelf_file.seek(0)
555
314
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
556
 
        self.addCleanup(unshelver.finalize)
557
315
        unshelver.make_merger().do_merge()
558
316
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
559
317
 
560
 
    def test_unshelve_deleted(self):
561
 
        tree = self.make_branch_and_tree('tree')
562
 
        tree.lock_write()
563
 
        self.addCleanup(tree.unlock)
564
 
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
565
 
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
566
 
        tree.commit('Added file and directory')
567
 
        tree.unversion(['foo-id', 'bar-id'])
568
 
        os.unlink('tree/foo/bar')
569
 
        os.rmdir('tree/foo')
570
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
571
 
        list(creator.iter_shelvable())
572
 
        creator.shelve_deletion('foo-id')
573
 
        creator.shelve_deletion('bar-id')
574
 
        with open('shelf', 'w+b') as shelf_file:
575
 
            creator.write_shelf(shelf_file)
576
 
            creator.transform()
577
 
            creator.finalize()
578
 
        # validate the test setup
579
 
        self.assertTrue(tree.has_id('foo-id'))
580
 
        self.assertTrue(tree.has_id('bar-id'))
581
 
        self.assertFileEqual('baz', 'tree/foo/bar')
582
 
        with open('shelf', 'r+b') as shelf_file:
583
 
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
584
 
            self.addCleanup(unshelver.finalize)
585
 
            unshelver.make_merger().do_merge()
586
 
        self.assertFalse(tree.has_id('foo-id'))
587
 
        self.assertFalse(tree.has_id('bar-id'))
588
 
 
589
318
    def test_unshelve_base(self):
590
319
        tree = self.make_branch_and_tree('tree')
591
320
        tree.lock_write()
612
341
        shelf_file = open('shelf', 'rb')
613
342
        self.addCleanup(shelf_file.close)
614
343
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
615
 
        unshelver.finalize()
616
344
 
617
345
    def test_corrupt_shelf(self):
618
346
        tree = self.make_branch_and_tree('.')
625
353
                              shelf_file)
626
354
        self.assertEqual('Shelf corrupt.', str(e))
627
355
 
628
 
    def test_unshelve_subdir_in_now_removed_dir(self):
629
 
        tree = self.make_branch_and_tree('.')
630
 
        self.addCleanup(tree.lock_write().unlock)
631
 
        self.build_tree(['dir/', 'dir/subdir/', 'dir/subdir/foo'])
632
 
        tree.add(['dir'], ['dir-id'])
633
 
        tree.commit('versioned dir')
634
 
        tree.add(['dir/subdir', 'dir/subdir/foo'], ['subdir-id', 'foo-id'])
635
 
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
636
 
        self.addCleanup(creator.finalize)
637
 
        for change in creator.iter_shelvable():
638
 
            creator.shelve_change(change)
639
 
        shelf_manager = tree.get_shelf_manager()
640
 
        shelf_id = shelf_manager.shelve_changes(creator)
641
 
        self.assertPathDoesNotExist('dir/subdir')
642
 
        tree.remove(['dir'])
643
 
        unshelver = shelf_manager.get_unshelver(shelf_id)
644
 
        self.addCleanup(unshelver.finalize)
645
 
        unshelver.make_merger().do_merge()
646
 
        self.assertPathExists('dir/subdir/foo')
647
 
        self.assertEqual('dir-id', tree.path2id('dir'))
648
 
        self.assertEqual('subdir-id', tree.path2id('dir/subdir'))
649
 
        self.assertEqual('foo-id', tree.path2id('dir/subdir/foo'))
650
 
 
651
356
 
652
357
class TestShelfManager(tests.TestCaseWithTransport):
653
358
 
748
453
        creator.shelve_creation('foo-id')
749
454
        shelf_manager = tree.get_shelf_manager()
750
455
        shelf_id = shelf_manager.shelve_changes(creator)
751
 
        self.assertPathDoesNotExist('tree/foo')
 
456
        self.failIfExists('tree/foo')
752
457
        unshelver = shelf_manager.get_unshelver(shelf_id)
753
 
        self.addCleanup(unshelver.finalize)
754
458
        unshelver.make_merger().do_merge()
755
459
        self.assertFileEqual('bar', 'tree/foo')
756
460
 
757
461
    def test_get_metadata(self):
758
462
        tree = self.make_branch_and_tree('.')
759
 
        tree.lock_tree_write()
760
 
        self.addCleanup(tree.unlock)
761
463
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
762
 
        self.addCleanup(creator.finalize)
763
464
        shelf_manager = tree.get_shelf_manager()
764
465
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
765
466
        metadata = shelf_manager.get_metadata(shelf_id)