← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Vincent Ladeuil
  • Date: 2010-03-10 09:33:04 UTC
  • mto: (5082.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5083.
  • Revision ID: v.ladeuil+lp@free.fr-20100310093304-4245t4tazd4sxoav
Cleanup test from overly cautious checks.

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