← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-14 13:56:45 UTC
  • mfrom: (6215 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111014135645-phc3q3y21k2ks0s2
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2006, 2007 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
17
17
# Original author: David Allouche
18
18
 
19
19
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
21
 
from bzrlib.bzrdir import BzrDir
 
20
from bzrlib.branch import Branch
 
21
from bzrlib.i18n import gettext
22
22
from bzrlib.trace import note
23
23
 
 
24
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
 
25
    from bzrlib.branch import SwitchHookParams
 
26
    hooks = Branch.hooks['post_switch']
 
27
    if not hooks:
 
28
        return
 
29
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
 
30
    for hook in hooks:
 
31
        hook(params)
24
32
 
25
 
def switch(control_dir, to_branch, force=False, quiet=False):
 
33
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
26
34
    """Switch the branch associated with a checkout.
27
35
 
28
 
    :param control_dir: BzrDir of the checkout to change
 
36
    :param control_dir: ControlDir of the checkout to change
29
37
    :param to_branch: branch that the checkout is to reference
30
38
    :param force: skip the check for local commits in a heavy checkout
 
39
    :param revision_id: revision ID to switch to.
31
40
    """
32
41
    _check_pending_merges(control_dir, force)
33
42
    try:
36
45
        source_repository = to_branch.repository
37
46
    _set_branch_location(control_dir, to_branch, force)
38
47
    tree = control_dir.open_workingtree()
39
 
    _update(tree, source_repository, quiet)
40
 
 
 
48
    _update(tree, source_repository, quiet, revision_id)
 
49
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
41
50
 
42
51
def _check_pending_merges(control, force=False):
43
52
    """Check that there are no outstanding pending merges before switching.
44
53
 
45
 
    :param control: BzrDir of the branch to check
 
54
    :param control: ControlDir of the branch to check
46
55
    """
47
56
    try:
48
57
        tree = control.open_workingtree()
55
64
    # XXX: Should the tree be locked for get_parent_ids?
56
65
    existing_pending_merges = tree.get_parent_ids()[1:]
57
66
    if len(existing_pending_merges) > 0:
58
 
        raise errors.BzrCommandError('Pending merges must be '
59
 
            'committed or reverted before using switch.')
 
67
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
68
            'committed or reverted before using switch.'))
60
69
 
61
70
 
62
71
def _set_branch_location(control, to_branch, force=False):
63
72
    """Set location value of a branch reference.
64
73
 
65
 
    :param control: BzrDir of the checkout to change
 
74
    :param control: ControlDir of the checkout to change
66
75
    :param to_branch: branch that the checkout is to reference
67
76
    :param force: skip the check for local commits in a heavy checkout
68
77
    """
69
78
    branch_format = control.find_branch_format()
70
79
    if branch_format.get_reference(control) is not None:
71
80
        # Lightweight checkout: update the branch reference
72
 
        branch_format.set_reference(control, to_branch)
 
81
        branch_format.set_reference(control, None, to_branch)
73
82
    else:
74
83
        b = control.open_branch()
75
84
        bound_branch = b.get_bound_location()
81
90
            possible_transports = []
82
91
            try:
83
92
                if not force and _any_local_commits(b, possible_transports):
84
 
                    raise errors.BzrCommandError(
 
93
                    raise errors.BzrCommandError(gettext(
85
94
                        'Cannot switch as local commits found in the checkout. '
86
95
                        'Commit these to the bound branch or use --force to '
87
 
                        'throw them away.')
 
96
                        'throw them away.'))
88
97
            except errors.BoundBranchConnectionFailure, e:
89
 
                raise errors.BzrCommandError(
 
98
                raise errors.BzrCommandError(gettext(
90
99
                        'Unable to connect to current master branch %(target)s: '
91
 
                        '%(error)s To switch anyway, use --force.' %
 
100
                        '%(error)s To switch anyway, use --force.') %
92
101
                        e.__dict__)
93
102
            b.set_bound_location(None)
94
103
            b.pull(to_branch, overwrite=True,
95
104
                possible_transports=possible_transports)
96
105
            b.set_bound_location(to_branch.base)
 
106
            b.set_parent(b.get_master_branch().get_parent())
97
107
        else:
98
 
            raise errors.BzrCommandError('Cannot switch a branch, '
99
 
                'only a checkout.')
 
108
            raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
109
                'only a checkout.'))
100
110
 
101
111
 
102
112
def _any_local_commits(this_branch, possible_transports):
118
128
    return False
119
129
 
120
130
 
121
 
def _update(tree, source_repository, quiet=False):
 
131
def _update(tree, source_repository, quiet=False, revision_id=None):
122
132
    """Update a working tree to the latest revision of its branch.
123
133
 
124
134
    :param tree: the working tree
127
137
    tree.lock_tree_write()
128
138
    try:
129
139
        to_branch = tree.branch
130
 
        if tree.last_revision() == to_branch.last_revision():
 
140
        if revision_id is None:
 
141
            revision_id = to_branch.last_revision()
 
142
        if tree.last_revision() == revision_id:
131
143
            if not quiet:
132
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
144
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
133
145
            return
134
146
        base_tree = source_repository.revision_tree(tree.last_revision())
135
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
 
147
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
136
148
        tree.set_last_revision(to_branch.last_revision())
137
149
        if not quiet:
138
 
            note('Updated to revision %d.' % to_branch.revno())
 
150
            note(gettext('Updated to revision %d.') % to_branch.revno())
139
151
    finally:
140
152
        tree.unlock()