← 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:09 UTC
  • mto: This revision was merged to the branch mainline in revision 6449.
  • Revision ID: jelmer@samba.org-20120127162709-eq21rt2enb9giauw
Fix support for tree-reference unpacking in 2a.

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
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
 
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()
81
92
            possible_transports = []
82
93
            try:
83
94
                if not force and _any_local_commits(b, possible_transports):
84
 
                    raise errors.BzrCommandError(
 
95
                    raise errors.BzrCommandError(gettext(
85
96
                        'Cannot switch as local commits found in the checkout. '
86
97
                        'Commit these to the bound branch or use --force to '
87
 
                        'throw them away.')
 
98
                        'throw them away.'))
88
99
            except errors.BoundBranchConnectionFailure, e:
89
 
                raise errors.BzrCommandError(
 
100
                raise errors.BzrCommandError(gettext(
90
101
                        'Unable to connect to current master branch %(target)s: '
91
 
                        '%(error)s To switch anyway, use --force.' %
 
102
                        '%(error)s To switch anyway, use --force.') %
92
103
                        e.__dict__)
93
104
            b.set_bound_location(None)
94
105
            b.pull(to_branch, overwrite=True,
95
106
                possible_transports=possible_transports)
96
107
            b.set_bound_location(to_branch.base)
 
108
            b.set_parent(b.get_master_branch().get_parent())
97
109
        else:
98
 
            raise errors.BzrCommandError('Cannot switch a branch, '
99
 
                'only a checkout.')
 
110
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
111
                'only a checkout.'))
100
112
 
101
113
 
102
114
def _any_local_commits(this_branch, possible_transports):
118
130
    return False
119
131
 
120
132
 
121
 
def _update(tree, source_repository):
 
133
def _update(tree, source_repository, quiet=False, revision_id=None):
122
134
    """Update a working tree to the latest revision of its branch.
123
135
 
124
136
    :param tree: the working tree
127
139
    tree.lock_tree_write()
128
140
    try:
129
141
        to_branch = tree.branch
130
 
        if tree.last_revision() == to_branch.last_revision():
131
 
            note("Tree is up to date at revision %d.", to_branch.revno())
 
142
        if revision_id is None:
 
143
            revision_id = to_branch.last_revision()
 
144
        if tree.last_revision() == revision_id:
 
145
            if not quiet:
 
146
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
132
147
            return
133
148
        base_tree = source_repository.revision_tree(tree.last_revision())
134
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
 
149
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
135
150
        tree.set_last_revision(to_branch.last_revision())
136
 
        note('Updated to revision %d.' % to_branch.revno())
 
151
        if not quiet:
 
152
            note(gettext('Updated to revision %d.') % to_branch.revno())
137
153
    finally:
138
154
        tree.unlock()