← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

(vila) Fix test failures blocking package builds. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008-2011 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
25
25
    transform,
26
26
    workingtree,
27
27
    )
 
28
from bzrlib.tests import (
 
29
    features,
 
30
    )
28
31
 
29
32
 
30
33
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
46
49
        tree.add(['foo'], ['foo-id'])
47
50
        tree.commit('foo')
48
51
        tree.rename_one('foo', 'bar')
 
52
        tree.lock_tree_write()
 
53
        self.addCleanup(tree.unlock)
49
54
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
50
55
        self.addCleanup(creator.finalize)
51
56
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
61
66
                         shelf_trans_id))
62
67
 
63
68
    def test_shelve_rename(self):
64
 
        self.thisFailsStrictLockCheck()
65
69
        creator = self.prepare_shelve_rename()
66
70
        creator.shelve_rename('foo-id')
67
71
        self.check_shelve_rename(creator)
68
72
 
69
73
    def test_shelve_change_handles_rename(self):
70
 
        self.thisFailsStrictLockCheck()
71
74
        creator = self.prepare_shelve_rename()
72
75
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
73
76
        self.check_shelve_rename(creator)
78
81
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
79
82
        tree.commit('foo')
80
83
        tree.rename_one('foo/baz', 'bar/baz')
 
84
        tree.lock_tree_write()
 
85
        self.addCleanup(tree.unlock)
81
86
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
82
87
        self.addCleanup(creator.finalize)
83
88
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
97
102
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
98
103
 
99
104
    def test_shelve_move(self):
100
 
        self.thisFailsStrictLockCheck()
101
105
        creator, tree = self.prepare_shelve_move()
102
106
        creator.shelve_rename('baz-id')
103
107
        self.check_shelve_move(creator, tree)
104
108
 
105
109
    def test_shelve_change_handles_move(self):
106
 
        self.thisFailsStrictLockCheck()
107
110
        creator, tree = self.prepare_shelve_move()
108
111
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
109
112
        self.check_shelve_move(creator, tree)
110
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
 
111
137
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
112
138
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
113
139
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
114
140
        self.assertFileEqual(expected_content, shelf_file)
115
141
 
116
 
    def test_shelve_content_change(self):
117
 
        self.thisFailsStrictLockCheck()
 
142
    def prepare_content_change(self):
118
143
        tree = self.make_branch_and_tree('.')
119
144
        tree.lock_write()
120
145
        self.addCleanup(tree.unlock)
124
149
        self.build_tree_contents([('foo', 'b\na\nc\n')])
125
150
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
126
151
        self.addCleanup(creator.finalize)
 
152
        return creator
 
153
 
 
154
    def test_shelve_content_change(self):
 
155
        creator = self.prepare_content_change()
127
156
        self.assertEqual([('modify text', 'foo-id')],
128
157
                         list(creator.iter_shelvable()))
129
158
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
131
160
        self.assertFileEqual('a\nc\n', 'foo')
132
161
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
133
162
 
 
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')
134
176
 
135
177
    def prepare_shelve_creation(self):
136
178
        tree = self.make_branch_and_tree('.')
152
194
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
153
195
        self.assertEqual('foo-id',
154
196
                         creator.shelf_transform.final_file_id(s_trans_id))
155
 
        self.failIfExists('foo')
156
 
        self.failIfExists('bar')
 
197
        self.assertPathDoesNotExist('foo')
 
198
        self.assertPathDoesNotExist('bar')
157
199
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
158
200
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
159
201
        self.assertEqual('directory',
160
202
            creator.shelf_transform.final_kind(s_bar_trans_id))
161
203
 
162
204
    def test_shelve_creation(self):
163
 
        self.thisFailsStrictLockCheck()
164
205
        creator, tree = self.prepare_shelve_creation()
165
206
        creator.shelve_creation('foo-id')
166
207
        creator.shelve_creation('bar-id')
168
209
        self.check_shelve_creation(creator, tree)
169
210
 
170
211
    def test_shelve_change_handles_creation(self):
171
 
        self.thisFailsStrictLockCheck()
172
212
        creator, tree = self.prepare_shelve_creation()
173
213
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
174
214
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
177
217
 
178
218
    def _test_shelve_symlink_creation(self, link_name, link_target,
179
219
                                      shelve_change=False):
180
 
        self.requireFeature(tests.SymlinkFeature)
 
220
        self.requireFeature(features.SymlinkFeature)
181
221
        tree = self.make_branch_and_tree('.')
182
222
        tree.lock_write()
183
223
        self.addCleanup(tree.unlock)
194
234
            creator.shelve_creation('foo-id')
195
235
        creator.transform()
196
236
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
197
 
        self.failIfExists(link_name)
 
237
        self.assertPathDoesNotExist(link_name)
198
238
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
199
239
        self.assertEqual(link_target, osutils.readlink(limbo_name))
200
240
        ptree = creator.shelf_transform.get_preview_tree()
201
241
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
202
242
 
203
243
    def test_shelve_symlink_creation(self):
204
 
        self.thisFailsStrictLockCheck()
205
244
        self._test_shelve_symlink_creation('foo', 'bar')
206
245
 
207
246
    def test_shelve_unicode_symlink_creation(self):
208
 
        self.requireFeature(tests.UnicodeFilenameFeature)
209
 
        self.thisFailsStrictLockCheck()
 
247
        self.requireFeature(features.UnicodeFilenameFeature)
210
248
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
211
249
                                           u'b\N{Euro Sign}ar')
212
250
 
213
251
    def test_shelve_change_handles_symlink_creation(self):
214
 
        self.thisFailsStrictLockCheck()
215
252
        self._test_shelve_symlink_creation('foo', 'bar', shelve_change=True)
216
253
 
217
254
    def _test_shelve_symlink_target_change(self, link_name,
218
255
                                           old_target, new_target,
219
256
                                           shelve_change=False):
220
 
        self.requireFeature(tests.SymlinkFeature)
 
257
        self.requireFeature(features.SymlinkFeature)
221
258
        tree = self.make_branch_and_tree('.')
222
259
        tree.lock_write()
223
260
        self.addCleanup(tree.unlock)
245
282
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
246
283
 
247
284
    def test_shelve_symlink_target_change(self):
248
 
        self.thisFailsStrictLockCheck()
249
285
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
250
286
 
251
287
    def test_shelve_unicode_symlink_target_change(self):
252
 
        self.thisFailsStrictLockCheck()
253
 
        self.requireFeature(tests.UnicodeFilenameFeature)
 
288
        self.requireFeature(features.UnicodeFilenameFeature)
254
289
        self._test_shelve_symlink_target_change(
255
290
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
256
291
 
257
292
    def test_shelve_change_handles_symlink_target_change(self):
258
 
        self.thisFailsStrictLockCheck()
259
293
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz',
260
294
                                                shelve_change=True)
261
295
 
262
296
    def test_shelve_creation_no_contents(self):
263
 
        self.thisFailsStrictLockCheck()
264
297
        tree = self.make_branch_and_tree('.')
265
298
        tree.lock_write()
266
299
        self.addCleanup(tree.unlock)
280
313
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
281
314
        self.assertEqual('foo-id',
282
315
                         creator.shelf_transform.final_file_id(s_trans_id))
283
 
        self.failIfExists('foo')
 
316
        self.assertPathDoesNotExist('foo')
284
317
 
285
318
    def prepare_shelve_deletion(self):
286
319
        tree = self.make_branch_and_tree('tree')
300
333
        return creator, tree
301
334
 
302
335
    def check_shelve_deletion(self, tree):
303
 
        self.assertTrue('foo-id' in tree)
304
 
        self.assertTrue('bar-id' in tree)
 
336
        self.assertTrue(tree.has_id('foo-id'))
 
337
        self.assertTrue(tree.has_id('bar-id'))
305
338
        self.assertFileEqual('baz', 'tree/foo/bar')
306
339
 
307
340
    def test_shelve_deletion(self):
308
 
        self.thisFailsStrictLockCheck()
309
341
        creator, tree = self.prepare_shelve_deletion()
310
342
        creator.shelve_deletion('foo-id')
311
343
        creator.shelve_deletion('bar-id')
313
345
        self.check_shelve_deletion(tree)
314
346
 
315
347
    def test_shelve_change_handles_deletion(self):
316
 
        self.thisFailsStrictLockCheck()
317
348
        creator, tree = self.prepare_shelve_deletion()
318
349
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
319
350
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
321
352
        self.check_shelve_deletion(tree)
322
353
 
323
354
    def test_shelve_delete_contents(self):
324
 
        self.thisFailsStrictLockCheck()
325
355
        tree = self.make_branch_and_tree('tree')
326
356
        self.build_tree(['tree/foo',])
327
357
        tree.add('foo', 'foo-id')
328
358
        tree.commit('Added file and directory')
329
359
        os.unlink('tree/foo')
 
360
        tree.lock_tree_write()
 
361
        self.addCleanup(tree.unlock)
330
362
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
331
363
        self.addCleanup(creator.finalize)
332
364
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
333
365
                         sorted(list(creator.iter_shelvable())))
334
366
        creator.shelve_deletion('foo-id')
335
367
        creator.transform()
336
 
        self.failUnlessExists('tree/foo')
 
368
        self.assertPathExists('tree/foo')
337
369
 
338
370
    def prepare_shelve_change_kind(self):
339
371
        tree = self.make_branch_and_tree('tree')
342
374
        tree.commit('Added file and directory')
343
375
        os.unlink('tree/foo')
344
376
        os.mkdir('tree/foo')
 
377
        tree.lock_tree_write()
 
378
        self.addCleanup(tree.unlock)
345
379
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
346
380
        self.addCleanup(creator.finalize)
347
381
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
355
389
                         creator.shelf_transform._new_contents[s_trans_id])
356
390
 
357
391
    def test_shelve_change_kind(self):
358
 
        self.thisFailsStrictLockCheck()
359
392
        creator = self.prepare_shelve_change_kind()
360
393
        creator.shelve_content_change('foo-id')
361
394
        creator.transform()
362
395
        self.check_shelve_change_kind(creator)
363
396
 
364
397
    def test_shelve_change_handles_change_kind(self):
365
 
        self.thisFailsStrictLockCheck()
366
398
        creator = self.prepare_shelve_change_kind()
367
399
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
368
400
                               'foo'))
370
402
        self.check_shelve_change_kind(creator)
371
403
 
372
404
    def test_shelve_change_unknown_change(self):
373
 
        self.thisFailsStrictLockCheck()
374
405
        tree = self.make_branch_and_tree('tree')
 
406
        tree.lock_tree_write()
 
407
        self.addCleanup(tree.unlock)
375
408
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
376
409
        self.addCleanup(creator.finalize)
377
410
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
378
411
        self.assertEqual('Unknown change kind: "unknown"', str(e))
379
412
 
380
413
    def test_shelve_unversion(self):
381
 
        self.thisFailsStrictLockCheck()
382
414
        tree = self.make_branch_and_tree('tree')
383
415
        self.build_tree(['tree/foo',])
384
416
        tree.add('foo', 'foo-id')
385
417
        tree.commit('Added file and directory')
386
418
        tree.unversion(['foo-id'])
 
419
        tree.lock_tree_write()
 
420
        self.addCleanup(tree.unlock)
387
421
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
388
422
        self.addCleanup(creator.finalize)
389
423
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
390
424
                         sorted(list(creator.iter_shelvable())))
391
425
        creator.shelve_deletion('foo-id')
392
426
        creator.transform()
393
 
        self.failUnlessExists('tree/foo')
 
427
        self.assertPathExists('tree/foo')
394
428
 
395
429
    def test_shelve_serialization(self):
396
 
        self.thisFailsStrictLockCheck()
397
430
        tree = self.make_branch_and_tree('.')
 
431
        tree.lock_tree_write()
 
432
        self.addCleanup(tree.unlock)
398
433
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
399
434
        self.addCleanup(creator.finalize)
400
435
        shelf_file = open('shelf', 'wb')
406
441
        self.assertFileEqual(EMPTY_SHELF, 'shelf')
407
442
 
408
443
    def test_write_shelf(self):
409
 
        self.thisFailsStrictLockCheck()
410
444
        tree = self.make_branch_and_tree('tree')
411
445
        self.build_tree(['tree/foo'])
412
446
        tree.add('foo', 'foo-id')
 
447
        tree.lock_tree_write()
 
448
        self.addCleanup(tree.unlock)
413
449
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
414
450
        self.addCleanup(creator.finalize)
415
451
        list(creator.iter_shelvable())
433
469
        tt.deserialize(records)
434
470
 
435
471
    def test_shelve_unversioned(self):
436
 
        self.thisFailsStrictLockCheck()
437
472
        tree = self.make_branch_and_tree('tree')
438
 
        self.assertRaises(errors.PathsNotVersionedError,
439
 
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
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()
440
479
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
441
480
        # after itself.
442
481
        wt = workingtree.WorkingTree.open('tree')
444
483
        wt.unlock()
445
484
        # And a second tentative should raise the same error (no
446
485
        # limbo/pending_deletion leftovers).
447
 
        self.assertRaises(errors.PathsNotVersionedError,
448
 
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
 
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()))
449
510
 
450
511
 
451
512
class TestUnshelver(tests.TestCaseWithTransport):
452
513
 
453
514
    def test_make_merger(self):
454
 
        self.thisFailsStrictLockCheck()
455
515
        tree = self.make_branch_and_tree('tree')
456
516
        tree.commit('first commit')
457
517
        self.build_tree_contents([('tree/foo', 'bar')])
469
529
            shelf_file.seek(0)
470
530
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
471
531
            unshelver.make_merger().do_merge()
 
532
            self.addCleanup(unshelver.finalize)
472
533
            self.assertFileEqual('bar', 'tree/foo')
473
534
        finally:
474
535
            shelf_file.close()
475
536
 
476
537
    def test_unshelve_changed(self):
477
 
        self.thisFailsStrictLockCheck()
478
538
        tree = self.make_branch_and_tree('tree')
479
539
        tree.lock_write()
480
540
        self.addCleanup(tree.unlock)
493
553
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
494
554
        shelf_file.seek(0)
495
555
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
556
        self.addCleanup(unshelver.finalize)
496
557
        unshelver.make_merger().do_merge()
497
558
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
498
559
 
499
560
    def test_unshelve_deleted(self):
500
 
        self.thisFailsStrictLockCheck()
501
561
        tree = self.make_branch_and_tree('tree')
502
562
        tree.lock_write()
503
563
        self.addCleanup(tree.unlock)
511
571
        list(creator.iter_shelvable())
512
572
        creator.shelve_deletion('foo-id')
513
573
        creator.shelve_deletion('bar-id')
514
 
        shelf_file = open('shelf', 'w+b')
515
 
        self.addCleanup(shelf_file.close)
516
 
        creator.write_shelf(shelf_file)
517
 
        creator.transform()
518
 
        creator.finalize()
 
574
        with open('shelf', 'w+b') as shelf_file:
 
575
            creator.write_shelf(shelf_file)
 
576
            creator.transform()
 
577
            creator.finalize()
519
578
        # validate the test setup
520
 
        self.assertTrue('foo-id' in tree)
521
 
        self.assertTrue('bar-id' in tree)
 
579
        self.assertTrue(tree.has_id('foo-id'))
 
580
        self.assertTrue(tree.has_id('bar-id'))
522
581
        self.assertFileEqual('baz', 'tree/foo/bar')
523
 
        shelf_file.seek(0)
524
 
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
525
 
        unshelver.make_merger().do_merge()
526
 
        self.assertFalse('foo-id' in tree)
527
 
        self.assertFalse('bar-id' in tree)
 
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'))
528
588
 
529
589
    def test_unshelve_base(self):
530
 
        self.thisFailsStrictLockCheck()
531
590
        tree = self.make_branch_and_tree('tree')
532
591
        tree.lock_write()
533
592
        self.addCleanup(tree.unlock)
548
607
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
549
608
 
550
609
    def test_unshelve_serialization(self):
551
 
        self.thisFailsStrictLockCheck()
552
610
        tree = self.make_branch_and_tree('.')
553
611
        self.build_tree_contents([('shelf', EMPTY_SHELF)])
554
612
        shelf_file = open('shelf', 'rb')
555
613
        self.addCleanup(shelf_file.close)
556
614
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
615
        unshelver.finalize()
557
616
 
558
617
    def test_corrupt_shelf(self):
559
 
        self.thisFailsStrictLockCheck()
560
618
        tree = self.make_branch_and_tree('.')
561
619
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
562
620
                                                                'foo'))])
567
625
                              shelf_file)
568
626
        self.assertEqual('Shelf corrupt.', str(e))
569
627
 
 
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
 
570
651
 
571
652
class TestShelfManager(tests.TestCaseWithTransport):
572
653
 
667
748
        creator.shelve_creation('foo-id')
668
749
        shelf_manager = tree.get_shelf_manager()
669
750
        shelf_id = shelf_manager.shelve_changes(creator)
670
 
        self.failIfExists('tree/foo')
 
751
        self.assertPathDoesNotExist('tree/foo')
671
752
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
753
        self.addCleanup(unshelver.finalize)
672
754
        unshelver.make_merger().do_merge()
673
755
        self.assertFileEqual('bar', 'tree/foo')
674
756
 
675
757
    def test_get_metadata(self):
676
758
        tree = self.make_branch_and_tree('.')
 
759
        tree.lock_tree_write()
 
760
        self.addCleanup(tree.unlock)
677
761
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
762
        self.addCleanup(creator.finalize)
678
763
        shelf_manager = tree.get_shelf_manager()
679
764
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
680
765
        metadata = shelf_manager.get_metadata(shelf_id)