/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 tests/test_shelf.py

  • Committer: Aaron Bentley
  • Date: 2008-10-09 12:47:07 UTC
  • mto: (0.15.11 unshelve)
  • mto: This revision was merged to the branch mainline in revision 3820.
  • Revision ID: aaron@aaronbentley.com-20081009124707-u3q69tkljecv9pyo
Provide path and kind when deletes/adds are detected.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test_shelf.py
91
91
        tree.add(['foo', 'bar'], ['foo-id', 'bar-id'])
92
92
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
93
93
        self.addCleanup(creator.finalize)
94
 
        self.assertEqual([('add file', 'bar-id', 'directory'),
95
 
                          ('add file', 'foo-id', 'file')],
 
94
        self.assertEqual([('add file', 'bar-id', 'directory', 'bar'),
 
95
                          ('add file', 'foo-id', 'file', 'foo')],
96
96
                          sorted(list(creator)))
97
97
        creator.shelve_creation('foo-id')
98
98
        creator.shelve_creation('bar-id')
119
119
        tree.add('foo', 'foo-id')
120
120
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
121
121
        self.addCleanup(creator.finalize)
122
 
        self.assertEqual([('add file', 'foo-id', 'symlink')], list(creator))
 
122
        self.assertEqual([('add file', 'foo-id', 'symlink', 'foo')],
 
123
                         list(creator))
123
124
        creator.shelve_creation('foo-id')
124
125
        creator.transform()
125
126
        s_trans_id = creator.shelf_transform.trans_id_file_id('foo-id')
137
138
        os.unlink('foo')
138
139
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
139
140
        self.addCleanup(creator.finalize)
140
 
        self.assertEqual([('add file', 'foo-id', None)],
 
141
        self.assertEqual([('add file', 'foo-id', None, 'foo')],
141
142
                         sorted(list(creator)))
142
143
        creator.shelve_creation('foo-id')
143
144
        creator.transform()
161
162
        os.rmdir('tree/foo')
162
163
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
163
164
        self.addCleanup(creator.finalize)
164
 
        self.assertEqual([('delete file', 'bar-id'),
165
 
                          ('delete file', 'foo-id')],
 
165
        self.assertEqual([('delete file', 'bar-id', 'file', 'foo/bar'),
 
166
                          ('delete file', 'foo-id', 'directory', 'foo')],
166
167
                          sorted(list(creator)))
167
168
        creator.shelve_deletion('foo-id')
168
169
        creator.shelve_deletion('bar-id')
179
180
        os.unlink('tree/foo')
180
181
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
181
182
        self.addCleanup(creator.finalize)
182
 
        self.assertEqual([('delete file', 'foo-id')], sorted(list(creator)))
 
183
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
184
                         sorted(list(creator)))
183
185
        creator.shelve_deletion('foo-id')
184
186
        creator.transform()
185
187
        self.failUnlessExists('tree/foo')
192
194
        tree.unversion(['foo-id'])
193
195
        creator = shelf.ShelfCreator(tree, tree.basis_tree())
194
196
        self.addCleanup(creator.finalize)
195
 
        self.assertEqual([('delete file', 'foo-id')], sorted(list(creator)))
 
197
        self.assertEqual([('delete file', 'foo-id', 'file', 'foo')],
 
198
                         sorted(list(creator)))
196
199
        creator.shelve_deletion('foo-id')
197
200
        creator.transform()
198
201
        self.failUnlessExists('tree/foo')