← 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-01-27 19:05:43 UTC
  • mto: This revision was merged to the branch mainline in revision 6450.
  • Revision ID: jelmer@samba.org-20120127190543-vk350mv4a0c7aug2
Fix weave test.

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, 2010 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
16
 
 
17
from __future__ import absolute_import
16
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
 
def switch(control_dir, to_branch, force=False):
 
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
 
41
    :param revision_id: revision ID to switch to.
31
42
    """
32
43
    _check_pending_merges(control_dir, force)
33
44
    try:
36
47
        source_repository = to_branch.repository
37
48
    _set_branch_location(control_dir, to_branch, force)
38
49
    tree = control_dir.open_workingtree()
39
 
    _update(tree, source_repository)
40
 
 
 
50
    _update(tree, source_repository, quiet, revision_id)
 
51
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
41
52
 
42
53
def _check_pending_merges(control, force=False):
43
54
    """Check that there are no outstanding pending merges before switching.
44
55
 
45
 
    :param control: BzrDir of the branch to check
 
56
    :param control: ControlDir of the branch to check
46
57
    """
47
58
    try:
48
59
        tree = control.open_workingtree()
55
66
    # XXX: Should the tree be locked for get_parent_ids?
56
67
    existing_pending_merges = tree.get_parent_ids()[1:]
57
68
    if len(existing_pending_merges) > 0:
58
 
        raise errors.BzrCommandError('Pending merges must be '
59
 
            'committed or reverted before using switch.')
 
69
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
70
            'committed or reverted before using switch.'))
60
71
 
61
72
 
62
73
def _set_branch_location(control, to_branch, force=False):
63
74
    """Set location value of a branch reference.
64
75
 
65
 
    :param control: BzrDir of the checkout to change
 
76
    :param control: ControlDir of the checkout to change
66
77
    :param to_branch: branch that the checkout is to reference
67
78
    :param force: skip the check for local commits in a heavy checkout
68
79
    """
69
80
    branch_format = control.find_branch_format()
70
81
    if branch_format.get_reference(control) is not None:
71
82
        # Lightweight checkout: update the branch reference
72
 
        branch_format.set_reference(control, to_branch)
 
83
        branch_format.set_reference(control, None, to_branch)
73
84
    else:
74
85
        b = control.open_branch()
75
86
        bound_branch = b.get_bound_location()
79
90
            # synchronise the local branch with the new remote branch
80
91
            # and bind to it
81
92
            possible_transports = []
82
 
            if not force and _any_local_commits(b, possible_transports):
83
 
                raise errors.BzrCommandError(
84
 
                    'Cannot switch as local commits found in the checkout. '
85
 
                    'Commit these to the bound branch or use --force to '
86
 
                    'throw them away.')
 
93
            try:
 
94
                if not force and _any_local_commits(b, possible_transports):
 
95
                    raise errors.BzrCommandError(gettext(
 
96
                        'Cannot switch as local commits found in the checkout. '
 
97
                        'Commit these to the bound branch or use --force to '
 
98
                        'throw them away.'))
 
99
            except errors.BoundBranchConnectionFailure, e:
 
100
                raise errors.BzrCommandError(gettext(
 
101
                        'Unable to connect to current master branch %(target)s: '
 
102
                        '%(error)s To switch anyway, use --force.') %
 
103
                        e.__dict__)
87
104
            b.set_bound_location(None)
88
105
            b.pull(to_branch, overwrite=True,
89
106
                possible_transports=possible_transports)
90
107
            b.set_bound_location(to_branch.base)
 
108
            b.set_parent(b.get_master_branch().get_parent())
91
109
        else:
92
 
            raise errors.BzrCommandError('Cannot switch a branch, '
93
 
                'only a checkout.')
 
110
            # If this is a standalone tree and the new branch
 
111
            # is derived from this one, create a lightweight checkout.
 
112
            graph = b.repository.get_graph(to_branch.repository)
 
113
            if (b.bzrdir._format.colocated_branches and
 
114
                 (force or graph.is_ancestor(b.last_revision(),
 
115
                    to_branch.last_revision()))):
 
116
                b.bzrdir.destroy_branch()
 
117
                b.bzrdir.set_branch_reference(to_branch, name="")
 
118
            else:
 
119
                raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
120
                    'only a checkout.'))
94
121
 
95
122
 
96
123
def _any_local_commits(this_branch, possible_transports):
112
139
    return False
113
140
 
114
141
 
115
 
def _update(tree, source_repository):
 
142
def _update(tree, source_repository, quiet=False, revision_id=None):
116
143
    """Update a working tree to the latest revision of its branch.
117
144
 
118
145
    :param tree: the working tree
121
148
    tree.lock_tree_write()
122
149
    try:
123
150
        to_branch = tree.branch
124
 
        if tree.last_revision() == to_branch.last_revision():
125
 
            note("Tree is up to date at revision %d.", to_branch.revno())
 
151
        if revision_id is None:
 
152
            revision_id = to_branch.last_revision()
 
153
        if tree.last_revision() == revision_id:
 
154
            if not quiet:
 
155
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
126
156
            return
127
157
        base_tree = source_repository.revision_tree(tree.last_revision())
128
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
 
158
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
129
159
        tree.set_last_revision(to_branch.last_revision())
130
 
        note('Updated to revision %d.' % to_branch.revno())
 
160
        if not quiet:
 
161
            note(gettext('Updated to revision %d.') % to_branch.revno())
131
162
    finally:
132
163
        tree.unlock()