~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/controldir.py

  • Committer: Vincent Ladeuil
  • Date: 2012-01-05 14:26:58 UTC
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120105142658-vek3v6pzlxb751s2
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. 

@only_raises is evil and gave a hard time since any exception during
save_changes() was swallowed.

Possible improvements: 

- add some needs_write_lock decorators to crucial
  methods (_set_config_location ?) but keep locking the branch at higher levels

- decorate branch.unlock to call stack.save if last_lock() it True
  outside of @only_raises scope (evil decorator)

- add @needs_write_lock to stack.set and stack.remove (will probably get
  rid of most testing issues) we probably need a specialized decorator
  that can relay to the store and from there to the branch or whatever is
  needed. This will also helps bzr config to get it right. The
  get_mutable_section trick should not be needed anymore either.

- decorate branch.unlock to call stack.save if last_lock() it True outside
  of @only_raises scope (evil decorator)

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# Copyright (C) 2010, 2011 Canonical Ltd
 
1
# Copyright (C) 2010, 2011, 2012 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
394
394
            repository_to.fetch(source.repository, revision_id=revision_id)
395
395
            br_to = source.clone(self, revision_id=revision_id)
396
396
            if source.get_push_location() is None or remember:
397
 
                source.set_push_location(br_to.base)
 
397
                source.lock_write()
 
398
                try:
 
399
                    source.set_push_location(br_to.base)
 
400
                finally:
 
401
                    source.unlock()
398
402
            push_result.stacked_on = None
399
403
            push_result.branch_push_result = None
400
404
            push_result.old_revno = None
405
409
        else:
406
410
            # We have successfully opened the branch, remember if necessary:
407
411
            if source.get_push_location() is None or remember:
408
 
                source.set_push_location(br_to.base)
 
412
                source.lock_write()
 
413
                try:
 
414
                    source.set_push_location(br_to.base)
 
415
                finally:
 
416
                    source.unlock()
409
417
            try:
410
418
                tree_to = self.open_workingtree()
411
419
            except errors.NotLocalUrl: