← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Ian Clatworthy
  • Date: 2007-12-07 05:31:54 UTC
  • mto: (3092.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3093.
  • Revision ID: ian.clatworthy@internode.on.net-20071207053154-k9tmyczcf8niwonm
fix efficiency of local commit detection as recommended by jameinel's review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd.
 
1
# Copyright (C) 2006, 2007 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
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
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
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
# Original author: David Allouche
18
18
 
19
19
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch
 
20
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
 
21
from bzrlib.bzrdir import BzrDir
21
22
from bzrlib.trace import note
22
23
 
23
24
 
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)
32
 
 
33
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
 
25
def switch(control_dir, to_branch, force=False):
34
26
    """Switch the branch associated with a checkout.
35
27
 
36
28
    :param control_dir: BzrDir of the checkout to change
37
29
    :param to_branch: branch that the checkout is to reference
38
30
    :param force: skip the check for local commits in a heavy checkout
39
 
    :param revision_id: revision ID to switch to.
40
31
    """
41
32
    _check_pending_merges(control_dir, force)
42
33
    try:
45
36
        source_repository = to_branch.repository
46
37
    _set_branch_location(control_dir, to_branch, force)
47
38
    tree = control_dir.open_workingtree()
48
 
    _update(tree, source_repository, quiet, revision_id)
49
 
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
 
39
    _update(tree, source_repository)
 
40
 
50
41
 
51
42
def _check_pending_merges(control, force=False):
52
43
    """Check that there are no outstanding pending merges before switching.
78
69
    branch_format = control.find_branch_format()
79
70
    if branch_format.get_reference(control) is not None:
80
71
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, None, to_branch)
 
72
        branch_format.set_reference(control, to_branch)
82
73
    else:
83
74
        b = control.open_branch()
84
75
        bound_branch = b.get_bound_location()
88
79
            # synchronise the local branch with the new remote branch
89
80
            # and bind to it
90
81
            possible_transports = []
91
 
            try:
92
 
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
94
 
                        'Cannot switch as local commits found in the checkout. '
95
 
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
97
 
            except errors.BoundBranchConnectionFailure, e:
 
82
            if not force and _any_local_commits(b, possible_transports):
98
83
                raise errors.BzrCommandError(
99
 
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
101
 
                        e.__dict__)
 
84
                    'Cannot switch as local commits found in the checkout. '
 
85
                    'Commit these to the bound branch or use --force to '
 
86
                    'throw them away.')
102
87
            b.set_bound_location(None)
103
88
            b.pull(to_branch, overwrite=True,
104
89
                possible_transports=possible_transports)
105
90
            b.set_bound_location(to_branch.base)
106
 
            b.set_parent(b.get_master_branch().get_parent())
107
91
        else:
108
92
            raise errors.BzrCommandError('Cannot switch a branch, '
109
93
                'only a checkout.')
128
112
    return False
129
113
 
130
114
 
131
 
def _update(tree, source_repository, quiet=False, revision_id=None):
 
115
def _update(tree, source_repository):
132
116
    """Update a working tree to the latest revision of its branch.
133
117
 
134
118
    :param tree: the working tree
137
121
    tree.lock_tree_write()
138
122
    try:
139
123
        to_branch = tree.branch
140
 
        if revision_id is None:
141
 
            revision_id = to_branch.last_revision()
142
 
        if tree.last_revision() == revision_id:
143
 
            if not quiet:
144
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
124
        if tree.last_revision() == to_branch.last_revision():
 
125
            note("Tree is up to date at revision %d.", to_branch.revno())
145
126
            return
146
127
        base_tree = source_repository.revision_tree(tree.last_revision())
147
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
 
128
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
148
129
        tree.set_last_revision(to_branch.last_revision())
149
 
        if not quiet:
150
 
            note('Updated to revision %d.' % to_branch.revno())
 
130
        note('Updated to revision %d.' % to_branch.revno())
151
131
    finally:
152
132
        tree.unlock()