← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Andrew Bennetts
  • Date: 2010-10-08 08:15:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5498.
  • Revision ID: andrew.bennetts@canonical.com-20101008081514-dviqzrdfwyzsqbz2
Split NEWS into per-release doc/en/release-notes/bzr-*.txt

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009-2012 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
 
 
19
17
# Original author: David Allouche
20
18
 
21
 
from bzrlib import (
22
 
    errors,
23
 
    lock,
24
 
    merge,
25
 
    revision
26
 
    )
 
19
from bzrlib import errors, merge, revision
27
20
from bzrlib.branch import Branch
28
 
from bzrlib.i18n import gettext
29
21
from bzrlib.trace import note
30
22
 
 
23
 
31
24
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
32
25
    from bzrlib.branch import SwitchHookParams
33
26
    hooks = Branch.hooks['post_switch']
37
30
    for hook in hooks:
38
31
        hook(params)
39
32
 
40
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
41
 
           store_uncommitted=False):
 
33
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
42
34
    """Switch the branch associated with a checkout.
43
35
 
44
 
    :param control_dir: ControlDir of the checkout to change
 
36
    :param control_dir: BzrDir of the checkout to change
45
37
    :param to_branch: branch that the checkout is to reference
46
38
    :param force: skip the check for local commits in a heavy checkout
47
39
    :param revision_id: revision ID to switch to.
48
 
    :param store_uncommitted: If True, store uncommitted changes in the
49
 
        branch.
50
40
    """
51
41
    _check_pending_merges(control_dir, force)
52
42
    try:
53
43
        source_repository = control_dir.open_branch().repository
54
44
    except errors.NotBranchError:
55
45
        source_repository = to_branch.repository
56
 
    if store_uncommitted:
57
 
        with lock.write_locked(control_dir.open_workingtree()) as tree:
58
 
            tree.store_uncommitted()
59
 
    to_branch.lock_read()
60
 
    try:
61
 
        _set_branch_location(control_dir, to_branch, force)
62
 
    finally:
63
 
        to_branch.unlock()
 
46
    _set_branch_location(control_dir, to_branch, force)
64
47
    tree = control_dir.open_workingtree()
65
 
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
 
48
    _update(tree, source_repository, quiet, revision_id)
66
49
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
67
50
 
68
51
def _check_pending_merges(control, force=False):
69
52
    """Check that there are no outstanding pending merges before switching.
70
53
 
71
 
    :param control: ControlDir of the branch to check
 
54
    :param control: BzrDir of the branch to check
72
55
    """
73
56
    try:
74
57
        tree = control.open_workingtree()
81
64
    # XXX: Should the tree be locked for get_parent_ids?
82
65
    existing_pending_merges = tree.get_parent_ids()[1:]
83
66
    if len(existing_pending_merges) > 0:
84
 
        raise errors.BzrCommandError(gettext('Pending merges must be '
85
 
            'committed or reverted before using switch.'))
 
67
        raise errors.BzrCommandError('Pending merges must be '
 
68
            'committed or reverted before using switch.')
86
69
 
87
70
 
88
71
def _set_branch_location(control, to_branch, force=False):
89
72
    """Set location value of a branch reference.
90
73
 
91
 
    :param control: ControlDir of the checkout to change
 
74
    :param control: BzrDir of the checkout to change
92
75
    :param to_branch: branch that the checkout is to reference
93
76
    :param force: skip the check for local commits in a heavy checkout
94
77
    """
107
90
            possible_transports = []
108
91
            try:
109
92
                if not force and _any_local_commits(b, possible_transports):
110
 
                    raise errors.BzrCommandError(gettext(
 
93
                    raise errors.BzrCommandError(
111
94
                        'Cannot switch as local commits found in the checkout. '
112
95
                        'Commit these to the bound branch or use --force to '
113
 
                        'throw them away.'))
 
96
                        'throw them away.')
114
97
            except errors.BoundBranchConnectionFailure, e:
115
 
                raise errors.BzrCommandError(gettext(
 
98
                raise errors.BzrCommandError(
116
99
                        'Unable to connect to current master branch %(target)s: '
117
 
                        '%(error)s To switch anyway, use --force.') %
 
100
                        '%(error)s To switch anyway, use --force.' %
118
101
                        e.__dict__)
119
 
            b.lock_write()
120
 
            try:
121
 
                b.set_bound_location(None)
122
 
                b.pull(to_branch, overwrite=True,
123
 
                       possible_transports=possible_transports)
124
 
                b.set_bound_location(to_branch.base)
125
 
                b.set_parent(b.get_master_branch().get_parent())
126
 
            finally:
127
 
                b.unlock()
 
102
            b.set_bound_location(None)
 
103
            b.pull(to_branch, overwrite=True,
 
104
                possible_transports=possible_transports)
 
105
            b.set_bound_location(to_branch.base)
128
106
        else:
129
 
            # If this is a standalone tree and the new branch
130
 
            # is derived from this one, create a lightweight checkout.
131
 
            b.lock_read()
132
 
            try:
133
 
                graph = b.repository.get_graph(to_branch.repository)
134
 
                if (b.bzrdir._format.colocated_branches and
135
 
                     (force or graph.is_ancestor(b.last_revision(),
136
 
                        to_branch.last_revision()))):
137
 
                    b.bzrdir.destroy_branch()
138
 
                    b.bzrdir.set_branch_reference(to_branch, name="")
139
 
                else:
140
 
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
141
 
                        'only a checkout.'))
142
 
            finally:
143
 
                b.unlock()
 
107
            raise errors.BzrCommandError('Cannot switch a branch, '
 
108
                'only a checkout.')
144
109
 
145
110
 
146
111
def _any_local_commits(this_branch, possible_transports):
162
127
    return False
163
128
 
164
129
 
165
 
def _update(tree, source_repository, quiet=False, revision_id=None,
166
 
            restore_uncommitted=False):
 
130
def _update(tree, source_repository, quiet=False, revision_id=None):
167
131
    """Update a working tree to the latest revision of its branch.
168
132
 
169
133
    :param tree: the working tree
170
134
    :param source_repository: repository holding the revisions
171
 
    :param restore_uncommitted: restore any uncommitted changes in the branch.
172
135
    """
173
 
    if restore_uncommitted:
174
 
        tree.lock_write()
175
 
    else:
176
 
        tree.lock_tree_write()
 
136
    tree.lock_tree_write()
177
137
    try:
178
138
        to_branch = tree.branch
179
139
        if revision_id is None:
180
140
            revision_id = to_branch.last_revision()
181
141
        if tree.last_revision() == revision_id:
182
142
            if not quiet:
183
 
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
184
 
        else:
185
 
            base_tree = source_repository.revision_tree(tree.last_revision())
186
 
            merge.Merge3Merger(tree, tree, base_tree,
187
 
                               to_branch.repository.revision_tree(revision_id))
188
 
            tree.set_last_revision(to_branch.last_revision())
189
 
            if not quiet:
190
 
                note(gettext('Updated to revision %d.') % to_branch.revno())
191
 
        if restore_uncommitted:
192
 
            tree.restore_uncommitted()
 
143
                note("Tree is up to date at revision %d.", to_branch.revno())
 
144
            return
 
145
        base_tree = source_repository.revision_tree(tree.last_revision())
 
146
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
 
147
        tree.set_last_revision(to_branch.last_revision())
 
148
        if not quiet:
 
149
            note('Updated to revision %d.' % to_branch.revno())
193
150
    finally:
194
151
        tree.unlock()