← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_branch.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/test_branch.py
352
352
    def test_config(self):
353
353
        """Ensure that all configuration data is stored in the branch"""
354
354
        branch = self.make_branch('a', format=self.get_format_name())
355
 
        self.addCleanup(branch.lock_write().unlock)
356
355
        branch.set_parent('http://example.com')
357
356
        self.assertPathDoesNotExist('a/.bzr/branch/parent')
358
357
        self.assertEqual('http://example.com', branch.get_parent())
667
666
    def check_append_revisions_only(self, expected_value, value=None):
668
667
        """Set append_revisions_only in config and check its interpretation."""
669
668
        if value is not None:
670
 
            self.branch.lock_write()
671
 
            try:
672
 
                self.config_stack.set('append_revisions_only', value)
673
 
            finally:
674
 
                self.branch.unlock()
 
669
            self.config_stack.set('append_revisions_only', value)
675
670
        self.assertEqual(expected_value,
676
671
                         self.branch.get_append_revisions_only())
677
672