← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-13 16:42:20 UTC
  • mto: This revision was merged to the branch mainline in revision 6512.
  • Revision ID: v.ladeuil+lp@free.fr-20120313164220-atkou2zprhlspmwg
Mention that a given config option cannot be safely handled via both APIs at the same time.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2006, 2007 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
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
 
17
from __future__ import absolute_import
 
18
 
17
19
# Original author: David Allouche
18
20
 
19
21
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
21
 
from bzrlib.bzrdir import BzrDir
 
22
from bzrlib.branch import Branch
 
23
from bzrlib.i18n import gettext
22
24
from bzrlib.trace import note
23
25
 
 
26
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
 
27
    from bzrlib.branch import SwitchHookParams
 
28
    hooks = Branch.hooks['post_switch']
 
29
    if not hooks:
 
30
        return
 
31
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
 
32
    for hook in hooks:
 
33
        hook(params)
24
34
 
25
35
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
26
36
    """Switch the branch associated with a checkout.
27
37
 
28
 
    :param control_dir: BzrDir of the checkout to change
 
38
    :param control_dir: ControlDir of the checkout to change
29
39
    :param to_branch: branch that the checkout is to reference
30
40
    :param force: skip the check for local commits in a heavy checkout
31
41
    :param revision_id: revision ID to switch to.
35
45
        source_repository = control_dir.open_branch().repository
36
46
    except errors.NotBranchError:
37
47
        source_repository = to_branch.repository
38
 
    _set_branch_location(control_dir, to_branch, force)
 
48
    to_branch.lock_read()
 
49
    try:
 
50
        _set_branch_location(control_dir, to_branch, force)
 
51
    finally:
 
52
        to_branch.unlock()
39
53
    tree = control_dir.open_workingtree()
40
54
    _update(tree, source_repository, quiet, revision_id)
41
 
 
 
55
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
42
56
 
43
57
def _check_pending_merges(control, force=False):
44
58
    """Check that there are no outstanding pending merges before switching.
45
59
 
46
 
    :param control: BzrDir of the branch to check
 
60
    :param control: ControlDir of the branch to check
47
61
    """
48
62
    try:
49
63
        tree = control.open_workingtree()
56
70
    # XXX: Should the tree be locked for get_parent_ids?
57
71
    existing_pending_merges = tree.get_parent_ids()[1:]
58
72
    if len(existing_pending_merges) > 0:
59
 
        raise errors.BzrCommandError('Pending merges must be '
60
 
            'committed or reverted before using switch.')
 
73
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
74
            'committed or reverted before using switch.'))
61
75
 
62
76
 
63
77
def _set_branch_location(control, to_branch, force=False):
64
78
    """Set location value of a branch reference.
65
79
 
66
 
    :param control: BzrDir of the checkout to change
 
80
    :param control: ControlDir of the checkout to change
67
81
    :param to_branch: branch that the checkout is to reference
68
82
    :param force: skip the check for local commits in a heavy checkout
69
83
    """
70
84
    branch_format = control.find_branch_format()
71
85
    if branch_format.get_reference(control) is not None:
72
86
        # Lightweight checkout: update the branch reference
73
 
        branch_format.set_reference(control, to_branch)
 
87
        branch_format.set_reference(control, None, to_branch)
74
88
    else:
75
89
        b = control.open_branch()
76
90
        bound_branch = b.get_bound_location()
82
96
            possible_transports = []
83
97
            try:
84
98
                if not force and _any_local_commits(b, possible_transports):
85
 
                    raise errors.BzrCommandError(
 
99
                    raise errors.BzrCommandError(gettext(
86
100
                        'Cannot switch as local commits found in the checkout. '
87
101
                        'Commit these to the bound branch or use --force to '
88
 
                        'throw them away.')
 
102
                        'throw them away.'))
89
103
            except errors.BoundBranchConnectionFailure, e:
90
 
                raise errors.BzrCommandError(
 
104
                raise errors.BzrCommandError(gettext(
91
105
                        'Unable to connect to current master branch %(target)s: '
92
 
                        '%(error)s To switch anyway, use --force.' %
 
106
                        '%(error)s To switch anyway, use --force.') %
93
107
                        e.__dict__)
94
 
            b.set_bound_location(None)
95
 
            b.pull(to_branch, overwrite=True,
96
 
                possible_transports=possible_transports)
97
 
            b.set_bound_location(to_branch.base)
 
108
            b.lock_write()
 
109
            try:
 
110
                b.set_bound_location(None)
 
111
                b.pull(to_branch, overwrite=True,
 
112
                       possible_transports=possible_transports)
 
113
                b.set_bound_location(to_branch.base)
 
114
                b.set_parent(b.get_master_branch().get_parent())
 
115
            finally:
 
116
                b.unlock()
98
117
        else:
99
 
            raise errors.BzrCommandError('Cannot switch a branch, '
100
 
                'only a checkout.')
 
118
            # If this is a standalone tree and the new branch
 
119
            # is derived from this one, create a lightweight checkout.
 
120
            b.lock_read()
 
121
            try:
 
122
                graph = b.repository.get_graph(to_branch.repository)
 
123
                if (b.bzrdir._format.colocated_branches and
 
124
                     (force or graph.is_ancestor(b.last_revision(),
 
125
                        to_branch.last_revision()))):
 
126
                    b.bzrdir.destroy_branch()
 
127
                    b.bzrdir.set_branch_reference(to_branch, name="")
 
128
                else:
 
129
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
130
                        'only a checkout.'))
 
131
            finally:
 
132
                b.unlock()
101
133
 
102
134
 
103
135
def _any_local_commits(this_branch, possible_transports):
132
164
            revision_id = to_branch.last_revision()
133
165
        if tree.last_revision() == revision_id:
134
166
            if not quiet:
135
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
167
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
136
168
            return
137
169
        base_tree = source_repository.revision_tree(tree.last_revision())
138
170
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
139
171
        tree.set_last_revision(to_branch.last_revision())
140
172
        if not quiet:
141
 
            note('Updated to revision %d.' % to_branch.revno())
 
173
            note(gettext('Updated to revision %d.') % to_branch.revno())
142
174
    finally:
143
175
        tree.unlock()