← 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 16:27:26 UTC
  • mto: This revision was merged to the branch mainline in revision 6449.
  • Revision ID: jelmer@samba.org-20120127162726-f3qlvm7xkfg460ck
Run subtree tests with development-subtree rather than deprecated dirstate-with-subtree.

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.
51
53
def _check_pending_merges(control, force=False):
52
54
    """Check that there are no outstanding pending merges before switching.
53
55
 
54
 
    :param control: BzrDir of the branch to check
 
56
    :param control: ControlDir of the branch to check
55
57
    """
56
58
    try:
57
59
        tree = control.open_workingtree()
64
66
    # XXX: Should the tree be locked for get_parent_ids?
65
67
    existing_pending_merges = tree.get_parent_ids()[1:]
66
68
    if len(existing_pending_merges) > 0:
67
 
        raise errors.BzrCommandError('Pending merges must be '
68
 
            'committed or reverted before using switch.')
 
69
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
70
            'committed or reverted before using switch.'))
69
71
 
70
72
 
71
73
def _set_branch_location(control, to_branch, force=False):
72
74
    """Set location value of a branch reference.
73
75
 
74
 
    :param control: BzrDir of the checkout to change
 
76
    :param control: ControlDir of the checkout to change
75
77
    :param to_branch: branch that the checkout is to reference
76
78
    :param force: skip the check for local commits in a heavy checkout
77
79
    """
78
80
    branch_format = control.find_branch_format()
79
81
    if branch_format.get_reference(control) is not None:
80
82
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
83
        branch_format.set_reference(control, None, to_branch)
82
84
    else:
83
85
        b = control.open_branch()
84
86
        bound_branch = b.get_bound_location()
90
92
            possible_transports = []
91
93
            try:
92
94
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
 
95
                    raise errors.BzrCommandError(gettext(
94
96
                        'Cannot switch as local commits found in the checkout. '
95
97
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
 
98
                        'throw them away.'))
97
99
            except errors.BoundBranchConnectionFailure, e:
98
 
                raise errors.BzrCommandError(
 
100
                raise errors.BzrCommandError(gettext(
99
101
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
 
102
                        '%(error)s To switch anyway, use --force.') %
101
103
                        e.__dict__)
102
104
            b.set_bound_location(None)
103
105
            b.pull(to_branch, overwrite=True,
104
106
                possible_transports=possible_transports)
105
107
            b.set_bound_location(to_branch.base)
 
108
            b.set_parent(b.get_master_branch().get_parent())
106
109
        else:
107
 
            raise errors.BzrCommandError('Cannot switch a branch, '
108
 
                'only a checkout.')
 
110
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
111
                'only a checkout.'))
109
112
 
110
113
 
111
114
def _any_local_commits(this_branch, possible_transports):
140
143
            revision_id = to_branch.last_revision()
141
144
        if tree.last_revision() == revision_id:
142
145
            if not quiet:
143
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
146
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
144
147
            return
145
148
        base_tree = source_repository.revision_tree(tree.last_revision())
146
149
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
147
150
        tree.set_last_revision(to_branch.last_revision())
148
151
        if not quiet:
149
 
            note('Updated to revision %d.' % to_branch.revno())
 
152
            note(gettext('Updated to revision %d.') % to_branch.revno())
150
153
    finally:
151
154
        tree.unlock()