← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Samuel Bronson
  • Date: 2012-08-30 20:36:18 UTC
  • mto: (6015.57.3 2.4)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: naesten@gmail.com-20120830203618-y2dzw91nqpvpgxvx
Update INSTALL for switch to Python 2.6 and up.

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
 
 
19
17
# Original author: David Allouche
20
18
 
21
19
from bzrlib import errors, merge, revision
22
20
from bzrlib.branch import Branch
23
 
from bzrlib.i18n import gettext
24
21
from bzrlib.trace import note
25
22
 
 
23
 
26
24
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
27
25
    from bzrlib.branch import SwitchHookParams
28
26
    hooks = Branch.hooks['post_switch']
35
33
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
36
34
    """Switch the branch associated with a checkout.
37
35
 
38
 
    :param control_dir: ControlDir of the checkout to change
 
36
    :param control_dir: BzrDir of the checkout to change
39
37
    :param to_branch: branch that the checkout is to reference
40
38
    :param force: skip the check for local commits in a heavy checkout
41
39
    :param revision_id: revision ID to switch to.
53
51
def _check_pending_merges(control, force=False):
54
52
    """Check that there are no outstanding pending merges before switching.
55
53
 
56
 
    :param control: ControlDir of the branch to check
 
54
    :param control: BzrDir of the branch to check
57
55
    """
58
56
    try:
59
57
        tree = control.open_workingtree()
66
64
    # XXX: Should the tree be locked for get_parent_ids?
67
65
    existing_pending_merges = tree.get_parent_ids()[1:]
68
66
    if len(existing_pending_merges) > 0:
69
 
        raise errors.BzrCommandError(gettext('Pending merges must be '
70
 
            'committed or reverted before using switch.'))
 
67
        raise errors.BzrCommandError('Pending merges must be '
 
68
            'committed or reverted before using switch.')
71
69
 
72
70
 
73
71
def _set_branch_location(control, to_branch, force=False):
74
72
    """Set location value of a branch reference.
75
73
 
76
 
    :param control: ControlDir of the checkout to change
 
74
    :param control: BzrDir of the checkout to change
77
75
    :param to_branch: branch that the checkout is to reference
78
76
    :param force: skip the check for local commits in a heavy checkout
79
77
    """
92
90
            possible_transports = []
93
91
            try:
94
92
                if not force and _any_local_commits(b, possible_transports):
95
 
                    raise errors.BzrCommandError(gettext(
 
93
                    raise errors.BzrCommandError(
96
94
                        'Cannot switch as local commits found in the checkout. '
97
95
                        'Commit these to the bound branch or use --force to '
98
 
                        'throw them away.'))
 
96
                        'throw them away.')
99
97
            except errors.BoundBranchConnectionFailure, e:
100
 
                raise errors.BzrCommandError(gettext(
 
98
                raise errors.BzrCommandError(
101
99
                        'Unable to connect to current master branch %(target)s: '
102
 
                        '%(error)s To switch anyway, use --force.') %
 
100
                        '%(error)s To switch anyway, use --force.' %
103
101
                        e.__dict__)
104
102
            b.set_bound_location(None)
105
103
            b.pull(to_branch, overwrite=True,
107
105
            b.set_bound_location(to_branch.base)
108
106
            b.set_parent(b.get_master_branch().get_parent())
109
107
        else:
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.'))
 
108
            raise errors.BzrCommandError('Cannot switch a branch, '
 
109
                'only a checkout.')
121
110
 
122
111
 
123
112
def _any_local_commits(this_branch, possible_transports):
152
141
            revision_id = to_branch.last_revision()
153
142
        if tree.last_revision() == revision_id:
154
143
            if not quiet:
155
 
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
 
144
                note("Tree is up to date at revision %d.", to_branch.revno())
156
145
            return
157
146
        base_tree = source_repository.revision_tree(tree.last_revision())
158
147
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
159
148
        tree.set_last_revision(to_branch.last_revision())
160
149
        if not quiet:
161
 
            note(gettext('Updated to revision %d.') % to_branch.revno())
 
150
            note('Updated to revision %d.' % to_branch.revno())
162
151
    finally:
163
152
        tree.unlock()