← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_merge_directive.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_merge_directive.py
44
44
    def prepare_merge_directive(self):
45
45
        self.tree1 = self.make_branch_and_tree('tree1')
46
46
        self.build_tree_contents([('tree1/file', 'a\nb\nc\nd\n')])
47
 
        self.tree1.branch.lock_write()
48
 
        try:
49
 
            self.tree1.branch.get_config_stack().set(
50
 
                'email', 'J. Random Hacker <jrandom@example.com>')
51
 
        finally:
52
 
            self.tree1.branch.unlock()
 
47
        self.tree1.branch.get_config_stack().set(
 
48
            'email', 'J. Random Hacker <jrandom@example.com>')
53
49
        self.tree1.add('file')
54
50
        self.tree1.commit('foo', rev_id='foo-id')
55
51
        self.tree2 = self.tree1.bzrdir.sprout('tree2').open_workingtree()
228
224
    def test_mail_uses_config(self):
229
225
        tree1, tree2 = self.prepare_merge_directive()
230
226
        br = tree1.branch
231
 
        br.lock_write()
232
 
        try:
233
 
            br.get_config_stack().set('smtp_server', 'bogushost')
234
 
        finally:
235
 
            br.unlock()
 
227
        br.get_config_stack().set('smtp_server', 'bogushost')
236
228
        md_text, errr, connect_calls, sendmail_calls =\
237
229
            self.run_bzr_fakemail('merge-directive --mail-to'
238
230
                                  ' pqm@example.com --plain ../tree2 .')