/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: John Arbash Meinel
  • Date: 2009-12-10 17:16:19 UTC
  • mfrom: (4884 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4889.
  • Revision ID: john@arbash-meinel.com-20091210171619-ehdcxjbl8afhq9g1
Bring in bzr.dev 4884

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
476
476
    def test_shelve_skips_added_root(self):
477
477
        """Skip adds of the root when iterating through shelvable changes."""
478
478
        tree = self.make_branch_and_tree('tree')
 
479
        tree.lock_tree_write()
 
480
        self.addCleanup(tree.unlock)
479
481
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
480
482
        self.addCleanup(creator.finalize)
481
483
        self.assertEqual([], list(creator.iter_shelvable()))
501
503
            shelf_file.seek(0)
502
504
            unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
503
505
            unshelver.make_merger().do_merge()
 
506
            self.addCleanup(unshelver.finalize)
504
507
            self.assertFileEqual('bar', 'tree/foo')
505
508
        finally:
506
509
            shelf_file.close()
524
527
        self.build_tree_contents([('tree/foo', 'z\na\nb\nc\n')])
525
528
        shelf_file.seek(0)
526
529
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
530
        self.addCleanup(unshelver.finalize)
527
531
        unshelver.make_merger().do_merge()
528
532
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
529
533
 
552
556
        self.assertFileEqual('baz', 'tree/foo/bar')
553
557
        shelf_file.seek(0)
554
558
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
559
        self.addCleanup(unshelver.finalize)
555
560
        unshelver.make_merger().do_merge()
556
561
        self.assertFalse('foo-id' in tree)
557
562
        self.assertFalse('bar-id' in tree)
697
702
        shelf_id = shelf_manager.shelve_changes(creator)
698
703
        self.failIfExists('tree/foo')
699
704
        unshelver = shelf_manager.get_unshelver(shelf_id)
 
705
        self.addCleanup(unshelver.finalize)
700
706
        unshelver.make_merger().do_merge()
701
707
        self.assertFileEqual('bar', 'tree/foo')
702
708