~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/blackbox/test_push.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:
514
514
        trunk_public.pull(trunk_tree.branch)
515
515
        trunk_public_url = self.get_readonly_url('public_trunk')
516
516
        br = trunk_tree.branch
517
 
        br.lock_write()
518
 
        try:
519
 
            br.set_public_branch(trunk_public_url)
520
 
        finally:
521
 
            br.unlock()
 
517
        br.set_public_branch(trunk_public_url)
522
518
        # now we do a stacked push, which should determine the public location
523
519
        # for us.
524
520
        out, err = self.run_bzr(['push', '--stacked',
716
712
 
717
713
    def set_config_push_strict(self, value):
718
714
        br = branch.Branch.open('local')
719
 
        br.lock_write()
720
 
        try:
721
 
            conf = br.get_config_stack()
722
 
            conf.set('push_strict', value)
723
 
        finally:
724
 
            br.unlock()
 
715
        br.get_config_stack().set('push_strict', value)
725
716
 
726
717
    _default_command = ['push', '../to']
727
718
    _default_wd = 'local'