← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to tests/test_shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-13 16:46:00 UTC
  • mto: (0.15.25 unshelve)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081013164600-zln9mqci0o02orpi
Allow shelving kind change

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_shelf.py
186
186
        creator.transform()
187
187
        self.failUnlessExists('tree/foo')
188
188
 
 
189
    def test_shelve_change_kind(self):
 
190
        tree = self.make_branch_and_tree('tree')
 
191
        self.build_tree_contents([('tree/foo', 'bar')])
 
192
        tree.add('foo', 'foo-id')
 
193
        tree.commit('Added file and directory')
 
194
        os.unlink('tree/foo')
 
195
        os.mkdir('tree/foo')
 
196
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
 
197
        self.addCleanup(creator.finalize)
 
198
        self.assertEqual([('change kind', 'foo-id', 'file', 'directory',
 
199
                           'foo')], sorted(list(creator)))
 
200
        creator.shelve_content_change('foo-id')
 
201
        creator.transform()
 
202
        self.assertFileEqual('bar', 'tree/foo')
 
203
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
 
204
        self.assertEqual('directory',
 
205
                         creator.shelf_transform._new_contents[s_trans_id])
 
206
 
189
207
    def test_shelve_unversion(self):
190
208
        tree = self.make_branch_and_tree('tree')
191
209
        self.build_tree(['tree/foo',])