/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: Jelmer Vernooij
  • Date: 2009-02-25 15:36:48 UTC
  • mfrom: (4048 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4050.
  • Revision ID: jelmer@samba.org-20090225153648-7r5mk20nr9dttqbf
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_shelf.py
315
315
        unshelver.make_merger().do_merge()
316
316
        self.assertFileEqual('z\na\nb\nd\n', 'tree/foo')
317
317
 
 
318
    def test_unshelve_deleted(self):
 
319
        tree = self.make_branch_and_tree('tree')
 
320
        tree.lock_write()
 
321
        self.addCleanup(tree.unlock)
 
322
        self.build_tree_contents([('tree/foo/',), ('tree/foo/bar', 'baz')])
 
323
        tree.add(['foo', 'foo/bar'], ['foo-id', 'bar-id'])
 
324
        tree.commit('Added file and directory')
 
325
        tree.unversion(['foo-id', 'bar-id'])
 
326
        os.unlink('tree/foo/bar')
 
327
        os.rmdir('tree/foo')
 
328
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
329
        list(creator.iter_shelvable())
 
330
        creator.shelve_deletion('foo-id')
 
331
        creator.shelve_deletion('bar-id')
 
332
        shelf_file = open('shelf', 'w+b')
 
333
        self.addCleanup(shelf_file.close)
 
334
        creator.write_shelf(shelf_file)
 
335
        creator.transform()
 
336
        creator.finalize()
 
337
        # validate the test setup
 
338
        self.assertTrue('foo-id' in tree)
 
339
        self.assertTrue('bar-id' in tree)
 
340
        self.assertFileEqual('baz', 'tree/foo/bar')
 
341
        shelf_file.seek(0)
 
342
        unshelver = shelf.Unshelver.from_tree_and_shelf(tree, shelf_file)
 
343
        unshelver.make_merger().do_merge()
 
344
        self.assertFalse('foo-id' in tree)
 
345
        self.assertFalse('bar-id' in tree)
 
346
 
318
347
    def test_unshelve_base(self):
319
348
        tree = self.make_branch_and_tree('tree')
320
349
        tree.lock_write()