/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 breezy/tests/per_branch/test_commit.py

  • Committer: Jelmer Vernooij
  • Date: 2017-10-26 11:12:08 UTC
  • mfrom: (6793.4.1 set-root-id)
  • Revision ID: jelmer@jelmer.uk-20171026111208-jfscgk3raav2cllf
Merge lp:~jelmer/brz/set-root-id.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_commit.py
185
185
        tree.lock_write()
186
186
        try:
187
187
            # setting up a playground
188
 
            tree.set_root_id('root_id')
189
 
            tree.add('rootfile', 'rootfile_id')
190
 
            tree.put_file_bytes_non_atomic('rootfile_id', 'abc')
191
 
            tree.add('dir', 'dir_id')
192
 
            tree.add('dir/subfile', 'dir_subfile_id')
193
 
            tree.mkdir('to_be_unversioned', 'to_be_unversioned_id')
194
 
            tree.put_file_bytes_non_atomic('dir_subfile_id', 'def')
 
188
            tree.add('rootfile')
 
189
            rootfile_id = tree.path2id('rootfile')
 
190
            tree.put_file_bytes_non_atomic(rootfile_id, 'abc')
 
191
            tree.add('dir')
 
192
            dir_id = tree.path2id('dir')
 
193
            tree.add('dir/subfile')
 
194
            dir_subfile_id = tree.path2id('dir/subfile')
 
195
            tree.mkdir('to_be_unversioned')
 
196
            to_be_unversioned_id = tree.path2id('to_be_unversioned')
 
197
            tree.put_file_bytes_non_atomic(dir_subfile_id, 'def')
195
198
            revid1 = tree.commit('first revision')
196
199
        finally:
197
200
            tree.unlock()
199
202
        tree.lock_write()
200
203
        try:
201
204
            # making changes
202
 
            tree.put_file_bytes_non_atomic('rootfile_id', 'jkl')
 
205
            tree.put_file_bytes_non_atomic(rootfile_id, 'jkl')
203
206
            tree.rename_one('dir/subfile', 'dir/subfile_renamed')
204
 
            tree.unversion(['to_be_unversioned_id'])
205
 
            tree.mkdir('added_dir', 'added_dir_id')
 
207
            tree.unversion([to_be_unversioned_id])
 
208
            tree.mkdir('added_dir')
 
209
            added_dir_id = tree.path2id('added_dir')
206
210
            # start to capture pre_commit delta
207
211
            branch.Branch.hooks.install_named_hook(
208
212
                "pre_commit", self.capture_pre_commit_hook, None)
211
215
            tree.unlock()
212
216
 
213
217
        expected_delta = delta.TreeDelta()
214
 
        expected_delta.added = [('added_dir', 'added_dir_id', 'directory')]
 
218
        expected_delta.added = [('added_dir', added_dir_id, 'directory')]
215
219
        expected_delta.removed = [('to_be_unversioned',
216
 
                                   'to_be_unversioned_id', 'directory')]
 
220
                                   to_be_unversioned_id, 'directory')]
217
221
        expected_delta.renamed = [('dir/subfile', 'dir/subfile_renamed',
218
 
                                   'dir_subfile_id', 'file', False, False)]
219
 
        expected_delta.modified=[('rootfile', 'rootfile_id', 'file', True,
 
222
                                   dir_subfile_id, 'file', False, False)]
 
223
        expected_delta.modified=[('rootfile', rootfile_id, 'file', True,
220
224
                                  False)]
221
225
        self.assertEqual([('pre_commit', 1, revid1, 2, revid2,
222
226
                           expected_delta)], self.hook_calls)