/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: 2018-01-15 06:26:48 UTC
  • mfrom: (6844.1.2 more-foreign-3)
  • Revision ID: jelmer@jelmer.uk-20180115062648-goqcy9j9jr5ri71l
merge lp:~jelmer/brz/more-foreign-3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_branch/test_commit.py
185
185
        # This does not try to validate data correctness in the delta.
186
186
        self.build_tree(['rootfile', 'dir/', 'dir/subfile'])
187
187
        tree = self.make_branch_and_tree('.')
188
 
        tree.lock_write()
189
 
        try:
 
188
        with tree.lock_write():
190
189
            # setting up a playground
191
190
            tree.add('rootfile')
192
191
            rootfile_id = tree.path2id('rootfile')
197
196
            dir_subfile_id = tree.path2id('dir/subfile')
198
197
            tree.mkdir('to_be_unversioned')
199
198
            to_be_unversioned_id = tree.path2id('to_be_unversioned')
200
 
            tree.put_file_bytes_non_atomic(dir_subfile_id, 'def')
 
199
            tree.put_file_bytes_non_atomic('dir/subfile', 'def')
201
200
            revid1 = tree.commit('first revision')
202
 
        finally:
203
 
            tree.unlock()
204
201
 
205
 
        tree.lock_write()
206
 
        try:
 
202
        with tree.lock_write():
207
203
            # making changes
208
204
            tree.put_file_bytes_non_atomic('rootfile', 'jkl')
209
205
            tree.rename_one('dir/subfile', 'dir/subfile_renamed')
214
210
            branch.Branch.hooks.install_named_hook(
215
211
                "pre_commit", self.capture_pre_commit_hook, None)
216
212
            revid2 = tree.commit('second revision')
217
 
        finally:
218
 
            tree.unlock()
219
213
 
220
214
        expected_delta = delta.TreeDelta()
221
215
        expected_delta.added = [('added_dir', added_dir_id, 'directory')]