~bzr-pqm/bzr/bzr.dev

4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2007, 2009, 2010 Canonical Ltd.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
19
# Original author: David Allouche
20
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
21
from bzrlib import errors, merge, revision
5162.3.4 by Aaron Bentley
Restore now-needed branch import.
22
from bzrlib.branch import Branch
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
23
from bzrlib.i18n import gettext
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
24
from bzrlib.trace import note
25
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
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)
34
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
35
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
36
    """Switch the branch associated with a checkout.
37
6207.3.3 by jelmer at samba
Fix tests and the like.
38
    :param control_dir: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
39
    :param to_branch: branch that the checkout is to reference
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
40
    :param force: skip the check for local commits in a heavy checkout
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
41
    :param revision_id: revision ID to switch to.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
42
    """
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
43
    _check_pending_merges(control_dir, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
44
    try:
45
        source_repository = control_dir.open_branch().repository
46
    except errors.NotBranchError:
47
        source_repository = to_branch.repository
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
48
    _set_branch_location(control_dir, to_branch, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
49
    tree = control_dir.open_workingtree()
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
50
    _update(tree, source_repository, quiet, revision_id)
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
51
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
52
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
53
def _check_pending_merges(control, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
54
    """Check that there are no outstanding pending merges before switching.
55
6207.3.3 by jelmer at samba
Fix tests and the like.
56
    :param control: ControlDir of the branch to check
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
57
    """
58
    try:
59
        tree = control.open_workingtree()
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
60
    except errors.NotBranchError, ex:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
61
        # Lightweight checkout and branch is no longer there
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
62
        if force:
63
            return
64
        else:
65
            raise ex
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
66
    # XXX: Should the tree be locked for get_parent_ids?
67
    existing_pending_merges = tree.get_parent_ids()[1:]
68
    if len(existing_pending_merges) > 0:
6138.3.8 by Jonathan Riddell
more error gettext()ing
69
        raise errors.BzrCommandError(gettext('Pending merges must be '
70
            'committed or reverted before using switch.'))
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
71
72
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
73
def _set_branch_location(control, to_branch, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
74
    """Set location value of a branch reference.
75
6207.3.3 by jelmer at samba
Fix tests and the like.
76
    :param control: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
77
    :param to_branch: branch that the checkout is to reference
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
78
    :param force: skip the check for local commits in a heavy checkout
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
79
    """
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
80
    branch_format = control.find_branch_format()
81
    if branch_format.get_reference(control) is not None:
82
        # Lightweight checkout: update the branch reference
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
83
        branch_format.set_reference(control, None, to_branch)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
84
    else:
85
        b = control.open_branch()
86
        bound_branch = b.get_bound_location()
87
        if bound_branch is not None:
88
            # Heavyweight checkout: check all local commits
89
            # have been pushed to the current bound branch then
90
            # synchronise the local branch with the new remote branch
91
            # and bind to it
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
92
            possible_transports = []
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
93
            try:
94
                if not force and _any_local_commits(b, possible_transports):
6138.3.8 by Jonathan Riddell
more error gettext()ing
95
                    raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
96
                        'Cannot switch as local commits found in the checkout. '
97
                        'Commit these to the bound branch or use --force to '
6138.3.8 by Jonathan Riddell
more error gettext()ing
98
                        'throw them away.'))
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
99
            except errors.BoundBranchConnectionFailure, e:
6138.3.8 by Jonathan Riddell
more error gettext()ing
100
                raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
101
                        'Unable to connect to current master branch %(target)s: '
6138.3.8 by Jonathan Riddell
more error gettext()ing
102
                        '%(error)s To switch anyway, use --force.') %
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
103
                        e.__dict__)
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
104
            b.set_bound_location(None)
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
105
            b.pull(to_branch, overwrite=True,
106
                possible_transports=possible_transports)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
107
            b.set_bound_location(to_branch.base)
5816.6.14 by A. S. Budden
Set the parent location of the bound branch to that of the master branch.
108
            b.set_parent(b.get_master_branch().get_parent())
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
109
        else:
6138.3.8 by Jonathan Riddell
more error gettext()ing
110
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
111
                'only a checkout.'))
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
112
113
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
114
def _any_local_commits(this_branch, possible_transports):
115
    """Does this branch have any commits not in the master branch?"""
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
116
    last_rev = revision.ensure_null(this_branch.last_revision())
117
    if last_rev != revision.NULL_REVISION:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
118
        other_branch = this_branch.get_master_branch(possible_transports)
119
        this_branch.lock_read()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
120
        other_branch.lock_read()
121
        try:
122
            other_last_rev = other_branch.last_revision()
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
123
            graph = this_branch.repository.get_graph(
124
                other_branch.repository)
125
            if not graph.is_ancestor(last_rev, other_last_rev):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
126
                return True
127
        finally:
128
            other_branch.unlock()
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
129
            this_branch.unlock()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
130
    return False
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
131
132
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
133
def _update(tree, source_repository, quiet=False, revision_id=None):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
134
    """Update a working tree to the latest revision of its branch.
135
136
    :param tree: the working tree
137
    :param source_repository: repository holding the revisions
138
    """
139
    tree.lock_tree_write()
140
    try:
141
        to_branch = tree.branch
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
142
        if revision_id is None:
143
            revision_id = to_branch.last_revision()
144
        if tree.last_revision() == revision_id:
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
145
            if not quiet:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
146
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
147
            return
148
        base_tree = source_repository.revision_tree(tree.last_revision())
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
149
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
150
        tree.set_last_revision(to_branch.last_revision())
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
151
        if not quiet:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
152
            note(gettext('Updated to revision %d.') % to_branch.revno())
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
153
    finally:
154
        tree.unlock()