/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_shelf.py

  • Committer: Martin Pool
  • Date: 2009-08-20 05:47:53 UTC
  • mto: This revision was merged to the branch mainline in revision 4632.
  • Revision ID: mbp@sourcefrog.net-20090820054753-yjio3skxpltbl32z
Remove unnecessary 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
46
46
        tree.add(['foo'], ['foo-id'])
47
47
        tree.commit('foo')
48
48
        tree.rename_one('foo', 'bar')
49
 
        tree.lock_tree_write()
50
 
        self.addCleanup(tree.unlock)
51
49
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
52
50
        self.addCleanup(creator.finalize)
53
51
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
63
61
                         shelf_trans_id))
64
62
 
65
63
    def test_shelve_rename(self):
 
64
        self.thisFailsStrictLockCheck()
66
65
        creator = self.prepare_shelve_rename()
67
66
        creator.shelve_rename('foo-id')
68
67
        self.check_shelve_rename(creator)
69
68
 
70
69
    def test_shelve_change_handles_rename(self):
 
70
        self.thisFailsStrictLockCheck()
71
71
        creator = self.prepare_shelve_rename()
72
72
        creator.shelve_change(('rename', 'foo-id', 'foo', 'bar'))
73
73
        self.check_shelve_rename(creator)
78
78
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
79
79
        tree.commit('foo')
80
80
        tree.rename_one('foo/baz', 'bar/baz')
81
 
        tree.lock_tree_write()
82
 
        self.addCleanup(tree.unlock)
83
81
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
84
82
        self.addCleanup(creator.finalize)
85
83
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
99
97
        self.assertEqual('foo/baz', tree.id2path('baz-id'))
100
98
 
101
99
    def test_shelve_move(self):
 
100
        self.thisFailsStrictLockCheck()
102
101
        creator, tree = self.prepare_shelve_move()
103
102
        creator.shelve_rename('baz-id')
104
103
        self.check_shelve_move(creator, tree)
105
104
 
106
105
    def test_shelve_change_handles_move(self):
 
106
        self.thisFailsStrictLockCheck()
107
107
        creator, tree = self.prepare_shelve_move()
108
108
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
109
109
        self.check_shelve_move(creator, tree)
110
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
111
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
135
112
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
136
113
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
137
114
        self.assertFileEqual(expected_content, shelf_file)
138
115
 
139
116
    def prepare_content_change(self):
 
117
        self.thisFailsStrictLockCheck()
140
118
        tree = self.make_branch_and_tree('.')
141
119
        tree.lock_write()
142
120
        self.addCleanup(tree.unlock)
199
177
            creator.shelf_transform.final_kind(s_bar_trans_id))
200
178
 
201
179
    def test_shelve_creation(self):
 
180
        self.thisFailsStrictLockCheck()
202
181
        creator, tree = self.prepare_shelve_creation()
203
182
        creator.shelve_creation('foo-id')
204
183
        creator.shelve_creation('bar-id')
206
185
        self.check_shelve_creation(creator, tree)
207
186
 
208
187
    def test_shelve_change_handles_creation(self):
 
188
        self.thisFailsStrictLockCheck()
209
189
        creator, tree = self.prepare_shelve_creation()
210
190
        creator.shelve_change(('add file', 'foo-id', 'file', 'foo'))
211
191
        creator.shelve_change(('add file', 'bar-id', 'directory', 'bar'))
238
218
        self.assertEqual(link_target, ptree.get_symlink_target('foo-id'))
239
219
 
240
220
    def test_shelve_symlink_creation(self):
 
221
        self.thisFailsStrictLockCheck()
241
222
        self._test_shelve_symlink_creation('foo', 'bar')
242
223
 
243
224
    def test_shelve_unicode_symlink_creation(self):
244
225
        self.requireFeature(tests.UnicodeFilenameFeature)
 
226
        self.thisFailsStrictLockCheck()
245
227
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
246
228
                                           u'b\N{Euro Sign}ar')
247
229
 
248
230
    def test_shelve_change_handles_symlink_creation(self):
 
231
        self.thisFailsStrictLockCheck()
249
232
        self._test_shelve_symlink_creation('foo', 'bar', shelve_change=True)
250
233
 
251
234
    def _test_shelve_symlink_target_change(self, link_name,
279
262
        self.assertEqual(new_target, ptree.get_symlink_target('foo-id'))
280
263
 
281
264
    def test_shelve_symlink_target_change(self):
 
265
        self.thisFailsStrictLockCheck()
282
266
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
283
267
 
284
268
    def test_shelve_unicode_symlink_target_change(self):
 
269
        self.thisFailsStrictLockCheck()
285
270
        self.requireFeature(tests.UnicodeFilenameFeature)
286
271
        self._test_shelve_symlink_target_change(
287
272
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
288
273
 
289
274
    def test_shelve_change_handles_symlink_target_change(self):
 
275
        self.thisFailsStrictLockCheck()
290
276
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz',
291
277
                                                shelve_change=True)
292
278
 
293
279
    def test_shelve_creation_no_contents(self):
 
280
        self.thisFailsStrictLockCheck()
294
281
        tree = self.make_branch_and_tree('.')
295
282
        tree.lock_write()
296
283
        self.addCleanup(tree.unlock)
335
322
        self.assertFileEqual('baz', 'tree/foo/bar')
336
323
 
337
324
    def test_shelve_deletion(self):
 
325
        self.thisFailsStrictLockCheck()
338
326
        creator, tree = self.prepare_shelve_deletion()
339
327
        creator.shelve_deletion('foo-id')
340
328
        creator.shelve_deletion('bar-id')
342
330
        self.check_shelve_deletion(tree)
343
331
 
344
332
    def test_shelve_change_handles_deletion(self):
 
333
        self.thisFailsStrictLockCheck()
345
334
        creator, tree = self.prepare_shelve_deletion()
346
335
        creator.shelve_change(('delete file', 'foo-id', 'directory', 'foo'))
347
336
        creator.shelve_change(('delete file', 'bar-id', 'file', 'foo/bar'))
349
338
        self.check_shelve_deletion(tree)
350
339
 
351
340
    def test_shelve_delete_contents(self):
 
341
        self.thisFailsStrictLockCheck()
352
342
        tree = self.make_branch_and_tree('tree')
353
343
        self.build_tree(['tree/foo',])
354
344
        tree.add('foo', 'foo-id')
355
345
        tree.commit('Added file and directory')
356
346
        os.unlink('tree/foo')
357
 
        tree.lock_tree_write()
358
 
        self.addCleanup(tree.unlock)
359
347
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
360
348
        self.addCleanup(creator.finalize)
361
349
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
371
359
        tree.commit('Added file and directory')
372
360
        os.unlink('tree/foo')
373
361
        os.mkdir('tree/foo')
374
 
        tree.lock_tree_write()
375
 
        self.addCleanup(tree.unlock)
376
362
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
377
363
        self.addCleanup(creator.finalize)
378
364
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
386
372
                         creator.shelf_transform._new_contents[s_trans_id])
387
373
 
388
374
    def test_shelve_change_kind(self):
 
375
        self.thisFailsStrictLockCheck()
389
376
        creator = self.prepare_shelve_change_kind()
390
377
        creator.shelve_content_change('foo-id')
391
378
        creator.transform()
392
379
        self.check_shelve_change_kind(creator)
393
380
 
394
381
    def test_shelve_change_handles_change_kind(self):
 
382
        self.thisFailsStrictLockCheck()
395
383
        creator = self.prepare_shelve_change_kind()
396
384
        creator.shelve_change(('change kind', 'foo-id', 'file', 'directory',
397
385
                               'foo'))
399
387
        self.check_shelve_change_kind(creator)
400
388
 
401
389
    def test_shelve_change_unknown_change(self):
 
390
        self.thisFailsStrictLockCheck()
402
391
        tree = self.make_branch_and_tree('tree')
403
 
        tree.lock_tree_write()
404
 
        self.addCleanup(tree.unlock)
405
392
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
406
393
        self.addCleanup(creator.finalize)
407
394
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
408
395
        self.assertEqual('Unknown change kind: "unknown"', str(e))
409
396
 
410
397
    def test_shelve_unversion(self):
 
398
        self.thisFailsStrictLockCheck()
411
399
        tree = self.make_branch_and_tree('tree')
412
400
        self.build_tree(['tree/foo',])
413
401
        tree.add('foo', 'foo-id')
414
402
        tree.commit('Added file and directory')
415
403
        tree.unversion(['foo-id'])
416
 
        tree.lock_tree_write()
417
 
        self.addCleanup(tree.unlock)
418
404
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
419
405
        self.addCleanup(creator.finalize)
420
406
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
424
410
        self.failUnlessExists('tree/foo')
425
411
 
426
412
    def test_shelve_serialization(self):
 
413
        self.thisFailsStrictLockCheck()
427
414
        tree = self.make_branch_and_tree('.')
428
 
        tree.lock_tree_write()
429
 
        self.addCleanup(tree.unlock)
430
415
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
431
416
        self.addCleanup(creator.finalize)
432
417
        shelf_file = open('shelf', 'wb')
438
423
        self.assertFileEqual(EMPTY_SHELF, 'shelf')
439
424
 
440
425
    def test_write_shelf(self):
 
426
        self.thisFailsStrictLockCheck()
441
427
        tree = self.make_branch_and_tree('tree')
442
428
        self.build_tree(['tree/foo'])
443
429
        tree.add('foo', 'foo-id')
444
 
        tree.lock_tree_write()
445
 
        self.addCleanup(tree.unlock)
446
430
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
447
431
        self.addCleanup(creator.finalize)
448
432
        list(creator.iter_shelvable())
466
450
        tt.deserialize(records)
467
451
 
468
452
    def test_shelve_unversioned(self):
 
453
        self.thisFailsStrictLockCheck()
469
454
        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()
 
455
        self.assertRaises(errors.PathsNotVersionedError,
 
456
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
476
457
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
477
458
        # after itself.
478
459
        wt = workingtree.WorkingTree.open('tree')
480
461
        wt.unlock()
481
462
        # And a second tentative should raise the same error (no
482
463
        # 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()))
 
464
        self.assertRaises(errors.PathsNotVersionedError,
 
465
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
507
466
 
508
467
 
509
468
class TestUnshelver(tests.TestCaseWithTransport):
510
469
 
511
470
    def test_make_merger(self):
 
471
        self.thisFailsStrictLockCheck()
512
472
        tree = self.make_branch_and_tree('tree')
513
473
        tree.commit('first commit')
514
474
        self.build_tree_contents([('tree/foo', 'bar')])
526
486
            shelf_file.seek(0)
527
487
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
528
488
            unshelver.make_merger().do_merge()
529
 
            self.addCleanup(unshelver.finalize)
530
489
            self.assertFileEqual('bar', 'tree/foo')
531
490
        finally:
532
491
            shelf_file.close()
533
492
 
534
493
    def test_unshelve_changed(self):
 
494
        self.thisFailsStrictLockCheck()
535
495
        tree = self.make_branch_and_tree('tree')
536
496
        tree.lock_write()
537
497
        self.addCleanup(tree.unlock)
550
510
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
551
511
        shelf_file.seek(0)
552
512
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
553
 
        self.addCleanup(unshelver.finalize)
554
513
        unshelver.make_merger().do_merge()
555
514
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
556
515
 
557
516
    def test_unshelve_deleted(self):
 
517
        self.thisFailsStrictLockCheck()
558
518
        tree = self.make_branch_and_tree('tree')
559
519
        tree.lock_write()
560
520
        self.addCleanup(tree.unlock)
579
539
        self.assertFileEqual('baz', 'tree/foo/bar')
580
540
        shelf_file.seek(0)
581
541
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
582
 
        self.addCleanup(unshelver.finalize)
583
542
        unshelver.make_merger().do_merge()
584
543
        self.assertFalse('foo-id' in tree)
585
544
        self.assertFalse('bar-id' in tree)
586
545
 
587
546
    def test_unshelve_base(self):
 
547
        self.thisFailsStrictLockCheck()
588
548
        tree = self.make_branch_and_tree('tree')
589
549
        tree.lock_write()
590
550
        self.addCleanup(tree.unlock)
605
565
        self.assertEqual('rev1', unshelver.base_tree.get_revision_id())
606
566
 
607
567
    def test_unshelve_serialization(self):
 
568
        self.thisFailsStrictLockCheck()
608
569
        tree = self.make_branch_and_tree('.')
609
570
        self.build_tree_contents([('shelf', EMPTY_SHELF)])
610
571
        shelf_file = open('shelf', 'rb')
611
572
        self.addCleanup(shelf_file.close)
612
573
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
613
 
        unshelver.finalize()
614
574
 
615
575
    def test_corrupt_shelf(self):
 
576
        self.thisFailsStrictLockCheck()
616
577
        tree = self.make_branch_and_tree('.')
617
578
        self.build_tree_contents([('shelf', EMPTY_SHELF.replace('metadata',
618
579
                                                                'foo'))])
725
686
        shelf_id = shelf_manager.shelve_changes(creator)
726
687
        self.failIfExists('tree/foo')
727
688
        unshelver = shelf_manager.get_unshelver(shelf_id)
728
 
        self.addCleanup(unshelver.finalize)
729
689
        unshelver.make_merger().do_merge()
730
690
        self.assertFileEqual('bar', 'tree/foo')
731
691
 
732
692
    def test_get_metadata(self):
733
693
        tree = self.make_branch_and_tree('.')
734
 
        tree.lock_tree_write()
735
 
        self.addCleanup(tree.unlock)
736
694
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
737
 
        self.addCleanup(creator.finalize)
738
695
        shelf_manager = tree.get_shelf_manager()
739
696
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
740
697
        metadata = shelf_manager.get_metadata(shelf_id)