← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Jelmer Vernooij
  • Date: 2012-02-20 12:19:29 UTC
  • mfrom: (6437.23.11 2.5)
  • mto: (6581.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 6582.
  • Revision ID: jelmer@samba.org-20120220121929-7ni2psvjoatm1yp4
Merge bzr/2.5.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
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
22
from bzrlib.branch import Branch
 
23
from bzrlib.i18n import gettext
21
24
from bzrlib.trace import note
22
25
 
23
 
 
24
26
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
25
27
    from bzrlib.branch import SwitchHookParams
26
28
    hooks = Branch.hooks['post_switch']
33
35
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
34
36
    """Switch the branch associated with a checkout.
35
37
 
36
 
    :param control_dir: BzrDir of the checkout to change
 
38
    :param control_dir: ControlDir of the checkout to change
37
39
    :param to_branch: branch that the checkout is to reference
38
40
    :param force: skip the check for local commits in a heavy checkout
39
41
    :param revision_id: revision ID to switch to.
43
45
        source_repository = control_dir.open_branch().repository
44
46
    except errors.NotBranchError:
45
47
        source_repository = to_branch.repository
46
 
    _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()
47
53
    tree = control_dir.open_workingtree()
48
54
    _update(tree, source_repository, quiet, revision_id)
49
55
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
51
57
def _check_pending_merges(control, force=False):
52
58
    """Check that there are no outstanding pending merges before switching.
53
59
 
54
 
    :param control: BzrDir of the branch to check
 
60
    :param control: ControlDir of the branch to check
55
61
    """
56
62
    try:
57
63
        tree = control.open_workingtree()
64
70
    # XXX: Should the tree be locked for get_parent_ids?
65
71
    existing_pending_merges = tree.get_parent_ids()[1:]
66
72
    if len(existing_pending_merges) > 0:
67
 
        raise errors.BzrCommandError('Pending merges must be '
68
 
            'committed or reverted before using switch.')
 
73
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
74
            'committed or reverted before using switch.'))
69
75
 
70
76
 
71
77
def _set_branch_location(control, to_branch, force=False):
72
78
    """Set location value of a branch reference.
73
79
 
74
 
    :param control: BzrDir of the checkout to change
 
80
    :param control: ControlDir of the checkout to change
75
81
    :param to_branch: branch that the checkout is to reference
76
82
    :param force: skip the check for local commits in a heavy checkout
77
83
    """
90
96
            possible_transports = []
91
97
            try:
92
98
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
 
99
                    raise errors.BzrCommandError(gettext(
94
100
                        'Cannot switch as local commits found in the checkout. '
95
101
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
 
102
                        'throw them away.'))
97
103
            except errors.BoundBranchConnectionFailure, e:
98
 
                raise errors.BzrCommandError(
 
104
                raise errors.BzrCommandError(gettext(
99
105
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
 
106
                        '%(error)s To switch anyway, use --force.') %
101
107
                        e.__dict__)
102
108
            b.set_bound_location(None)
103
109
            b.pull(to_branch, overwrite=True,
105
111
            b.set_bound_location(to_branch.base)
106
112
            b.set_parent(b.get_master_branch().get_parent())
107
113
        else:
108
 
            raise errors.BzrCommandError('Cannot switch a branch, '
109
 
                'only a checkout.')
 
114
            # If this is a standalone tree and the new branch
 
115
            # is derived from this one, create a lightweight checkout.
 
116
            b.lock_read()
 
117
            try:
 
118
                graph = b.repository.get_graph(to_branch.repository)
 
119
                if (b.bzrdir._format.colocated_branches and
 
120
                     (force or graph.is_ancestor(b.last_revision(),
 
121
                        to_branch.last_revision()))):
 
122
                    b.bzrdir.destroy_branch()
 
123
                    b.bzrdir.set_branch_reference(to_branch, name="")
 
124
                else:
 
125
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
126
                        'only a checkout.'))
 
127
            finally:
 
128
                b.unlock()
110
129
 
111
130
 
112
131
def _any_local_commits(this_branch, possible_transports):
141
160
            revision_id = to_branch.last_revision()
142
161
        if tree.last_revision() == revision_id:
143
162
            if not quiet:
144
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
163
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
145
164
            return
146
165
        base_tree = source_repository.revision_tree(tree.last_revision())
147
166
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
148
167
        tree.set_last_revision(to_branch.last_revision())
149
168
        if not quiet:
150
 
            note('Updated to revision %d.' % to_branch.revno())
 
169
            note(gettext('Updated to revision %d.') % to_branch.revno())
151
170
    finally:
152
171
        tree.unlock()