← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Martin Pool
  • Date: 2005-07-05 08:09:30 UTC
  • Revision ID: mbp@sourcefrog.net-20050705080929-f44361a66a8b2e29
- Merge3.find_sync_regions always returns a zero-length sentinal at the end to
  ease matching.

- Merge3.merge partially done.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009-2012 Canonical Ltd.
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
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from __future__ import absolute_import
18
 
 
19
 
# Original author: David Allouche
20
 
 
21
 
from bzrlib import errors, merge, revision
22
 
from bzrlib.branch import Branch
23
 
from bzrlib.i18n import gettext
24
 
from bzrlib.trace import note
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)
34
 
 
35
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
36
 
    """Switch the branch associated with a checkout.
37
 
 
38
 
    :param control_dir: ControlDir of the checkout to change
39
 
    :param to_branch: branch that the checkout is to reference
40
 
    :param force: skip the check for local commits in a heavy checkout
41
 
    :param revision_id: revision ID to switch to.
42
 
    """
43
 
    _check_pending_merges(control_dir, force)
44
 
    try:
45
 
        source_repository = control_dir.open_branch().repository
46
 
    except errors.NotBranchError:
47
 
        source_repository = to_branch.repository
48
 
    to_branch.lock_read()
49
 
    try:
50
 
        _set_branch_location(control_dir, to_branch, force)
51
 
    finally:
52
 
        to_branch.unlock()
53
 
    tree = control_dir.open_workingtree()
54
 
    _update(tree, source_repository, quiet, revision_id)
55
 
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
56
 
 
57
 
def _check_pending_merges(control, force=False):
58
 
    """Check that there are no outstanding pending merges before switching.
59
 
 
60
 
    :param control: ControlDir of the branch to check
61
 
    """
62
 
    try:
63
 
        tree = control.open_workingtree()
64
 
    except errors.NotBranchError, ex:
65
 
        # Lightweight checkout and branch is no longer there
66
 
        if force:
67
 
            return
68
 
        else:
69
 
            raise ex
70
 
    # XXX: Should the tree be locked for get_parent_ids?
71
 
    existing_pending_merges = tree.get_parent_ids()[1:]
72
 
    if len(existing_pending_merges) > 0:
73
 
        raise errors.BzrCommandError(gettext('Pending merges must be '
74
 
            'committed or reverted before using switch.'))
75
 
 
76
 
 
77
 
def _set_branch_location(control, to_branch, force=False):
78
 
    """Set location value of a branch reference.
79
 
 
80
 
    :param control: ControlDir of the checkout to change
81
 
    :param to_branch: branch that the checkout is to reference
82
 
    :param force: skip the check for local commits in a heavy checkout
83
 
    """
84
 
    branch_format = control.find_branch_format()
85
 
    if branch_format.get_reference(control) is not None:
86
 
        # Lightweight checkout: update the branch reference
87
 
        branch_format.set_reference(control, None, to_branch)
88
 
    else:
89
 
        b = control.open_branch()
90
 
        bound_branch = b.get_bound_location()
91
 
        if bound_branch is not None:
92
 
            # Heavyweight checkout: check all local commits
93
 
            # have been pushed to the current bound branch then
94
 
            # synchronise the local branch with the new remote branch
95
 
            # and bind to it
96
 
            possible_transports = []
97
 
            try:
98
 
                if not force and _any_local_commits(b, possible_transports):
99
 
                    raise errors.BzrCommandError(gettext(
100
 
                        'Cannot switch as local commits found in the checkout. '
101
 
                        'Commit these to the bound branch or use --force to '
102
 
                        'throw them away.'))
103
 
            except errors.BoundBranchConnectionFailure, e:
104
 
                raise errors.BzrCommandError(gettext(
105
 
                        'Unable to connect to current master branch %(target)s: '
106
 
                        '%(error)s To switch anyway, use --force.') %
107
 
                        e.__dict__)
108
 
            b.lock_write()
109
 
            try:
110
 
                b.set_bound_location(None)
111
 
                b.pull(to_branch, overwrite=True,
112
 
                       possible_transports=possible_transports)
113
 
                b.set_bound_location(to_branch.base)
114
 
                b.set_parent(b.get_master_branch().get_parent())
115
 
            finally:
116
 
                b.unlock()
117
 
        else:
118
 
            # If this is a standalone tree and the new branch
119
 
            # is derived from this one, create a lightweight checkout.
120
 
            b.lock_read()
121
 
            try:
122
 
                graph = b.repository.get_graph(to_branch.repository)
123
 
                if (b.bzrdir._format.colocated_branches and
124
 
                     (force or graph.is_ancestor(b.last_revision(),
125
 
                        to_branch.last_revision()))):
126
 
                    b.bzrdir.destroy_branch()
127
 
                    b.bzrdir.set_branch_reference(to_branch, name="")
128
 
                else:
129
 
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
130
 
                        'only a checkout.'))
131
 
            finally:
132
 
                b.unlock()
133
 
 
134
 
 
135
 
def _any_local_commits(this_branch, possible_transports):
136
 
    """Does this branch have any commits not in the master branch?"""
137
 
    last_rev = revision.ensure_null(this_branch.last_revision())
138
 
    if last_rev != revision.NULL_REVISION:
139
 
        other_branch = this_branch.get_master_branch(possible_transports)
140
 
        this_branch.lock_read()
141
 
        other_branch.lock_read()
142
 
        try:
143
 
            other_last_rev = other_branch.last_revision()
144
 
            graph = this_branch.repository.get_graph(
145
 
                other_branch.repository)
146
 
            if not graph.is_ancestor(last_rev, other_last_rev):
147
 
                return True
148
 
        finally:
149
 
            other_branch.unlock()
150
 
            this_branch.unlock()
151
 
    return False
152
 
 
153
 
 
154
 
def _update(tree, source_repository, quiet=False, revision_id=None):
155
 
    """Update a working tree to the latest revision of its branch.
156
 
 
157
 
    :param tree: the working tree
158
 
    :param source_repository: repository holding the revisions
159
 
    """
160
 
    tree.lock_tree_write()
161
 
    try:
162
 
        to_branch = tree.branch
163
 
        if revision_id is None:
164
 
            revision_id = to_branch.last_revision()
165
 
        if tree.last_revision() == revision_id:
166
 
            if not quiet:
167
 
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
168
 
            return
169
 
        base_tree = source_repository.revision_tree(tree.last_revision())
170
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
171
 
        tree.set_last_revision(to_branch.last_revision())
172
 
        if not quiet:
173
 
            note(gettext('Updated to revision %d.') % to_branch.revno())
174
 
    finally:
175
 
        tree.unlock()