~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.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) 2007, 2009, 2010 Canonical Ltd.
 
1
# Copyright (C) 2007, 2009-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
101
101
                        'Unable to connect to current master branch %(target)s: '
102
102
                        '%(error)s To switch anyway, use --force.') %
103
103
                        e.__dict__)
104
 
            b.set_bound_location(None)
105
 
            b.pull(to_branch, overwrite=True,
106
 
                possible_transports=possible_transports)
107
 
            b.set_bound_location(to_branch.base)
108
 
            b.set_parent(b.get_master_branch().get_parent())
 
104
            b.lock_write()
 
105
            try:
 
106
                b.set_bound_location(None)
 
107
                b.pull(to_branch, overwrite=True,
 
108
                       possible_transports=possible_transports)
 
109
                b.set_bound_location(to_branch.base)
 
110
                b.set_parent(b.get_master_branch().get_parent())
 
111
            finally:
 
112
                b.unlock()
109
113
        else:
110
114
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
111
115
                'only a checkout.'))