/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Robert Collins
  • Date: 2010-05-06 11:08:10 UTC
  • mto: This revision was merged to the branch mainline in revision 5223.
  • Revision ID: robertc@robertcollins.net-20100506110810-h3j07fh5gmw54s25
Cleaner matcher matching revised unlocking protocol.

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
    """
80
78
    branch_format = control.find_branch_format()
81
79
    if branch_format.get_reference(control) is not None:
82
80
        # Lightweight checkout: update the branch reference
83
 
        branch_format.set_reference(control, None, to_branch)
 
81
        branch_format.set_reference(control, to_branch)
84
82
    else:
85
83
        b = control.open_branch()
86
84
        bound_branch = b.get_bound_location()
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,
106
104
                possible_transports=possible_transports)
107
105
            b.set_bound_location(to_branch.base)
108
 
            b.set_parent(b.get_master_branch().get_parent())
109
106
        else:
110
 
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
111
 
                'only a checkout.'))
 
107
            raise errors.BzrCommandError('Cannot switch a branch, '
 
108
                'only a checkout.')
112
109
 
113
110
 
114
111
def _any_local_commits(this_branch, possible_transports):
143
140
            revision_id = to_branch.last_revision()
144
141
        if tree.last_revision() == revision_id:
145
142
            if not quiet:
146
 
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
 
143
                note("Tree is up to date at revision %d.", to_branch.revno())
147
144
            return
148
145
        base_tree = source_repository.revision_tree(tree.last_revision())
149
146
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
150
147
        tree.set_last_revision(to_branch.last_revision())
151
148
        if not quiet:
152
 
            note(gettext('Updated to revision %d.') % to_branch.revno())
 
149
            note('Updated to revision %d.' % to_branch.revno())
153
150
    finally:
154
151
        tree.unlock()