← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_add.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-18 14:09:19 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120118140919-rlvdrhpc0nq1lbwi
Change set/remove to require a lock for the branch config files.

This means that tests (or any plugin for that matter) do not requires an
explicit lock on the branch anymore to change a single option. This also
means the optimisation becomes "opt-in" and as such won't be as
spectacular as it may be and/or harder to get right (nothing fails
anymore).

This reduces the diff by ~300 lines.

Code/tests that were updating more than one config option is still taking
a lock to at least avoid some IOs and demonstrate the benefits through
the decreased number of hpss calls.

The duplication between BranchStack and BranchOnlyStack will be removed
once the same sharing is in place for local config files, at which point
the Stack class itself may be able to host the changes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/blackbox/test_add.py
247
247
        self.build_tree_contents([('small.txt', '0\n')])
248
248
        self.build_tree_contents([('big.txt', '01234567890123456789\n')])
249
249
        self.build_tree_contents([('big2.txt', '01234567890123456789\n')])
250
 
        tree.branch.lock_write()
251
 
        try:
252
 
            tree.branch.get_config_stack().set('add.maximum_file_size', 5)
253
 
        finally:
254
 
            tree.branch.unlock()
 
250
        tree.branch.get_config_stack().set('add.maximum_file_size', 5)
255
251
        out = self.run_bzr('add')[0]
256
252
        results = sorted(out.rstrip('\n').split('\n'))
257
253
        self.assertEquals(['adding small.txt'], results)
260
256
        results = sorted(out.rstrip('\n').split('\n'))
261
257
        self.assertEquals(['adding big2.txt'], results)
262
258
        self.assertEquals("", err)
263
 
        tree.branch.lock_write()
264
 
        try:
265
 
            tree.branch.get_config_stack().set('add.maximum_file_size', 30)
266
 
        finally:
267
 
            tree.branch.unlock()
 
259
        tree.branch.get_config_stack().set('add.maximum_file_size', 30)
268
260
        out = self.run_bzr('add')[0]
269
261
        results = sorted(out.rstrip('\n').split('\n'))
270
262
        self.assertEquals(['adding big.txt'], results)