← 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: Danny van Heumen
  • Date: 2010-03-09 21:42:11 UTC
  • mto: (4634.139.5 2.0)
  • mto: This revision was merged to the branch mainline in revision 5160.
  • Revision ID: danny@dannyvanheumen.nl-20100309214211-iqh42x6qcikgd9p3
Reverted now-useless TODO list.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
499
499
    def test_shelve_skips_added_root(self):
500
500
        """Skip adds of the root when iterating through shelvable changes."""
501
501
        tree = self.make_branch_and_tree('tree')
502
 
        tree.lock_tree_write()
503
 
        self.addCleanup(tree.unlock)
504
502
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
505
503
        self.addCleanup(creator.finalize)
506
504
        self.assertEqual([], list(creator.iter_shelvable()))
526
524
            shelf_file.seek(0)
527
525
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
528
526
            unshelver.make_merger().do_merge()
529
 
            self.addCleanup(unshelver.finalize)
530
527
            self.assertFileEqual('bar', 'tree/foo')
531
528
        finally:
532
529
            shelf_file.close()
550
547
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
551
548
        shelf_file.seek(0)
552
549
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
553
 
        self.addCleanup(unshelver.finalize)
554
550
        unshelver.make_merger().do_merge()
555
551
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
556
552
 
579
575
        self.assertFileEqual('baz', 'tree/foo/bar')
580
576
        shelf_file.seek(0)
581
577
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
582
 
        self.addCleanup(unshelver.finalize)
583
578
        unshelver.make_merger().do_merge()
584
579
        self.assertFalse('foo-id' in tree)
585
580
        self.assertFalse('bar-id' in tree)
725
720
        shelf_id = shelf_manager.shelve_changes(creator)
726
721
        self.failIfExists('tree/foo')
727
722
        unshelver = shelf_manager.get_unshelver(shelf_id)
728
 
        self.addCleanup(unshelver.finalize)
729
723
        unshelver.make_merger().do_merge()
730
724
        self.assertFileEqual('bar', 'tree/foo')
731
725