← 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: Robert Collins
  • Date: 2009-07-27 04:24:36 UTC
  • mto: This revision was merged to the branch mainline in revision 4572.
  • Revision ID: robertc@robertcollins.net-20090727042436-dvr4bpwie5sk3cfn
Fix repr() on Stat objects from the readdir C extension.

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
25
25
    transform,
26
26
    workingtree,
27
27
    )
28
 
from bzrlib.tests import (
29
 
    features,
30
 
    )
31
28
 
32
29
 
33
30
EMPTY_SHELF = ("Bazaar pack format 1 (introduced in 0.18)\n"
49
46
        tree.add(['foo'], ['foo-id'])
50
47
        tree.commit('foo')
51
48
        tree.rename_one('foo', 'bar')
52
 
        tree.lock_tree_write()
53
 
        self.addCleanup(tree.unlock)
54
49
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
55
50
        self.addCleanup(creator.finalize)
56
51
        self.assertEqual([('rename', 'foo-id', 'foo', 'bar')],
81
76
        tree.add(['foo', 'bar', 'foo/baz'], ['foo-id', 'bar-id', 'baz-id'])
82
77
        tree.commit('foo')
83
78
        tree.rename_one('foo/baz', 'bar/baz')
84
 
        tree.lock_tree_write()
85
 
        self.addCleanup(tree.unlock)
86
79
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
87
80
        self.addCleanup(creator.finalize)
88
81
        self.assertEqual([('rename', 'baz-id', 'foo/baz', 'bar/baz')],
111
104
        creator.shelve_change(('rename', 'baz-id', 'foo/baz', 'bar/baz'))
112
105
        self.check_shelve_move(creator, tree)
113
106
 
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
107
    def assertShelvedFileEqual(self, expected_content, creator, file_id):
138
108
        s_trans_id = creator.shelf_transform.trans_id_file_id(file_id)
139
109
        shelf_file = creator.shelf_transform._limbo_name(s_trans_id)
140
110
        self.assertFileEqual(expected_content, shelf_file)
141
111
 
142
 
    def prepare_content_change(self):
 
112
    def test_shelve_content_change(self):
143
113
        tree = self.make_branch_and_tree('.')
144
114
        tree.lock_write()
145
115
        self.addCleanup(tree.unlock)
149
119
        self.build_tree_contents([('foo', 'b\na\nc\n')])
150
120
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
151
121
        self.addCleanup(creator.finalize)
152
 
        return creator
153
 
 
154
 
    def test_shelve_content_change(self):
155
 
        creator = self.prepare_content_change()
156
122
        self.assertEqual([('modify text', 'foo-id')],
157
123
                         list(creator.iter_shelvable()))
158
124
        creator.shelve_lines('foo-id', ['a\n', 'c\n'])
160
126
        self.assertFileEqual('a\nc\n', 'foo')
161
127
        self.assertShelvedFileEqual('b\na\n', creator, 'foo-id')
162
128
 
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
129
 
177
130
    def prepare_shelve_creation(self):
178
131
        tree = self.make_branch_and_tree('.')
194
147
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
195
148
        self.assertEqual('foo-id',
196
149
                         creator.shelf_transform.final_file_id(s_trans_id))
197
 
        self.assertPathDoesNotExist('foo')
198
 
        self.assertPathDoesNotExist('bar')
 
150
        self.failIfExists('foo')
 
151
        self.failIfExists('bar')
199
152
        self.assertShelvedFileEqual('a\n', creator, 'foo-id')
200
153
        s_bar_trans_id = creator.shelf_transform.trans_id_file_id('bar-id')
201
154
        self.assertEqual('directory',
217
170
 
218
171
    def _test_shelve_symlink_creation(self, link_name, link_target,
219
172
                                      shelve_change=False):
220
 
        self.requireFeature(features.SymlinkFeature)
 
173
        self.requireFeature(tests.SymlinkFeature)
221
174
        tree = self.make_branch_and_tree('.')
222
175
        tree.lock_write()
223
176
        self.addCleanup(tree.unlock)
234
187
            creator.shelve_creation('foo-id')
235
188
        creator.transform()
236
189
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
237
 
        self.assertPathDoesNotExist(link_name)
 
190
        self.failIfExists(link_name)
238
191
        limbo_name = creator.shelf_transform._limbo_name(s_trans_id)
239
192
        self.assertEqual(link_target, osutils.readlink(limbo_name))
240
193
        ptree = creator.shelf_transform.get_preview_tree()
244
197
        self._test_shelve_symlink_creation('foo', 'bar')
245
198
 
246
199
    def test_shelve_unicode_symlink_creation(self):
247
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
200
        self.requireFeature(tests.UnicodeFilenameFeature)
248
201
        self._test_shelve_symlink_creation(u'fo\N{Euro Sign}o',
249
202
                                           u'b\N{Euro Sign}ar')
250
203
 
254
207
    def _test_shelve_symlink_target_change(self, link_name,
255
208
                                           old_target, new_target,
256
209
                                           shelve_change=False):
257
 
        self.requireFeature(features.SymlinkFeature)
 
210
        self.requireFeature(tests.SymlinkFeature)
258
211
        tree = self.make_branch_and_tree('.')
259
212
        tree.lock_write()
260
213
        self.addCleanup(tree.unlock)
285
238
        self._test_shelve_symlink_target_change('foo', 'bar', 'baz')
286
239
 
287
240
    def test_shelve_unicode_symlink_target_change(self):
288
 
        self.requireFeature(features.UnicodeFilenameFeature)
 
241
        self.requireFeature(tests.UnicodeFilenameFeature)
289
242
        self._test_shelve_symlink_target_change(
290
243
            u'fo\N{Euro Sign}o', u'b\N{Euro Sign}ar', u'b\N{Euro Sign}az')
291
244
 
313
266
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
314
267
        self.assertEqual('foo-id',
315
268
                         creator.shelf_transform.final_file_id(s_trans_id))
316
 
        self.assertPathDoesNotExist('foo')
 
269
        self.failIfExists('foo')
317
270
 
318
271
    def prepare_shelve_deletion(self):
319
272
        tree = self.make_branch_and_tree('tree')
333
286
        return creator, tree
334
287
 
335
288
    def check_shelve_deletion(self, tree):
336
 
        self.assertTrue(tree.has_id('foo-id'))
337
 
        self.assertTrue(tree.has_id('bar-id'))
 
289
        self.assertTrue('foo-id' in tree)
 
290
        self.assertTrue('bar-id' in tree)
338
291
        self.assertFileEqual('baz', 'tree/foo/bar')
339
292
 
340
293
    def test_shelve_deletion(self):
357
310
        tree.add('foo', 'foo-id')
358
311
        tree.commit('Added file and directory')
359
312
        os.unlink('tree/foo')
360
 
        tree.lock_tree_write()
361
 
        self.addCleanup(tree.unlock)
362
313
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
363
314
        self.addCleanup(creator.finalize)
364
315
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
365
316
                         sorted(list(creator.iter_shelvable())))
366
317
        creator.shelve_deletion('foo-id')
367
318
        creator.transform()
368
 
        self.assertPathExists('tree/foo')
 
319
        self.failUnlessExists('tree/foo')
369
320
 
370
321
    def prepare_shelve_change_kind(self):
371
322
        tree = self.make_branch_and_tree('tree')
374
325
        tree.commit('Added file and directory')
375
326
        os.unlink('tree/foo')
376
327
        os.mkdir('tree/foo')
377
 
        tree.lock_tree_write()
378
 
        self.addCleanup(tree.unlock)
379
328
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
380
329
        self.addCleanup(creator.finalize)
381
330
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
403
352
 
404
353
    def test_shelve_change_unknown_change(self):
405
354
        tree = self.make_branch_and_tree('tree')
406
 
        tree.lock_tree_write()
407
 
        self.addCleanup(tree.unlock)
408
355
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
409
356
        self.addCleanup(creator.finalize)
410
357
        e = self.assertRaises(ValueError, creator.shelve_change, ('unknown',))
416
363
        tree.add('foo', 'foo-id')
417
364
        tree.commit('Added file and directory')
418
365
        tree.unversion(['foo-id'])
419
 
        tree.lock_tree_write()
420
 
        self.addCleanup(tree.unlock)
421
366
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
422
367
        self.addCleanup(creator.finalize)
423
368
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
424
369
                         sorted(list(creator.iter_shelvable())))
425
370
        creator.shelve_deletion('foo-id')
426
371
        creator.transform()
427
 
        self.assertPathExists('tree/foo')
 
372
        self.failUnlessExists('tree/foo')
428
373
 
429
374
    def test_shelve_serialization(self):
430
375
        tree = self.make_branch_and_tree('.')
431
 
        tree.lock_tree_write()
432
 
        self.addCleanup(tree.unlock)
433
376
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
434
377
        self.addCleanup(creator.finalize)
435
378
        shelf_file = open('shelf', 'wb')
444
387
        tree = self.make_branch_and_tree('tree')
445
388
        self.build_tree(['tree/foo'])
446
389
        tree.add('foo', 'foo-id')
447
 
        tree.lock_tree_write()
448
 
        self.addCleanup(tree.unlock)
449
390
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
450
391
        self.addCleanup(creator.finalize)
451
392
        list(creator.iter_shelvable())
470
411
 
471
412
    def test_shelve_unversioned(self):
472
413
        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()
 
414
        self.assertRaises(errors.PathsNotVersionedError,
 
415
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
479
416
        # We should be able to lock/unlock the tree if ShelfCreator cleaned
480
417
        # after itself.
481
418
        wt = workingtree.WorkingTree.open('tree')
483
420
        wt.unlock()
484
421
        # And a second tentative should raise the same error (no
485
422
        # 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()))
 
423
        self.assertRaises(errors.PathsNotVersionedError,
 
424
                          shelf.ShelfCreator, tree, tree.basis_tree(), ['foo'])
510
425
 
511
426
 
512
427
class TestUnshelver(tests.TestCaseWithTransport):
529
444
            shelf_file.seek(0)
530
445
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
531
446
            unshelver.make_merger().do_merge()
532
 
            self.addCleanup(unshelver.finalize)
533
447
            self.assertFileEqual('bar', 'tree/foo')
534
448
        finally:
535
449
            shelf_file.close()
553
467
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
554
468
        shelf_file.seek(0)
555
469
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
556
 
        self.addCleanup(unshelver.finalize)
557
470
        unshelver.make_merger().do_merge()
558
471
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
559
472
 
571
484
        list(creator.iter_shelvable())
572
485
        creator.shelve_deletion('foo-id')
573
486
        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()
 
487
        shelf_file = open('shelf', 'w+b')
 
488
        self.addCleanup(shelf_file.close)
 
489
        creator.write_shelf(shelf_file)
 
490
        creator.transform()
 
491
        creator.finalize()
578
492
        # validate the test setup
579
 
        self.assertTrue(tree.has_id('foo-id'))
580
 
        self.assertTrue(tree.has_id('bar-id'))
 
493
        self.assertTrue('foo-id' in tree)
 
494
        self.assertTrue('bar-id' in tree)
581
495
        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'))
 
496
        shelf_file.seek(0)
 
497
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
498
        unshelver.make_merger().do_merge()
 
499
        self.assertFalse('foo-id' in tree)
 
500
        self.assertFalse('bar-id' in tree)
588
501
 
589
502
    def test_unshelve_base(self):
590
503
        tree = self.make_branch_and_tree('tree')
612
525
        shelf_file = open('shelf', 'rb')
613
526
        self.addCleanup(shelf_file.close)
614
527
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
615
 
        unshelver.finalize()
616
528
 
617
529
    def test_corrupt_shelf(self):
618
530
        tree = self.make_branch_and_tree('.')
625
537
                              shelf_file)
626
538
        self.assertEqual('Shelf corrupt.', str(e))
627
539
 
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
540
 
652
541
class TestShelfManager(tests.TestCaseWithTransport):
653
542
 
748
637
        creator.shelve_creation('foo-id')
749
638
        shelf_manager = tree.get_shelf_manager()
750
639
        shelf_id = shelf_manager.shelve_changes(creator)
751
 
        self.assertPathDoesNotExist('tree/foo')
 
640
        self.failIfExists('tree/foo')
752
641
        unshelver = shelf_manager.get_unshelver(shelf_id)
753
 
        self.addCleanup(unshelver.finalize)
754
642
        unshelver.make_merger().do_merge()
755
643
        self.assertFileEqual('bar', 'tree/foo')
756
644
 
757
645
    def test_get_metadata(self):
758
646
        tree = self.make_branch_and_tree('.')
759
 
        tree.lock_tree_write()
760
 
        self.addCleanup(tree.unlock)
761
647
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
762
 
        self.addCleanup(creator.finalize)
763
648
        shelf_manager = tree.get_shelf_manager()
764
649
        shelf_id = shelf_manager.shelve_changes(creator, 'foo')
765
650
        metadata = shelf_manager.get_metadata(shelf_id)