← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

(vila) Make all transport put_bytes() raises TypeError when given unicode
 strings rather than bytes (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
18
18
 
19
19
# Original author: David Allouche
20
20
 
21
 
from bzrlib import errors, merge, revision
 
21
from bzrlib import (
 
22
    errors,
 
23
    lock,
 
24
    merge,
 
25
    revision
 
26
    )
22
27
from bzrlib.branch import Branch
23
28
from bzrlib.i18n import gettext
24
29
from bzrlib.trace import note
32
37
    for hook in hooks:
33
38
        hook(params)
34
39
 
35
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
 
40
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
 
41
           store_uncommitted=False):
36
42
    """Switch the branch associated with a checkout.
37
43
 
38
44
    :param control_dir: ControlDir of the checkout to change
39
45
    :param to_branch: branch that the checkout is to reference
40
46
    :param force: skip the check for local commits in a heavy checkout
41
47
    :param revision_id: revision ID to switch to.
 
48
    :param store_uncommitted: If True, store uncommitted changes in the
 
49
        branch.
42
50
    """
43
51
    _check_pending_merges(control_dir, force)
44
52
    try:
45
53
        source_repository = control_dir.open_branch().repository
46
54
    except errors.NotBranchError:
47
55
        source_repository = to_branch.repository
 
56
    if store_uncommitted:
 
57
        with lock.write_locked(control_dir.open_workingtree()) as tree:
 
58
            tree.store_uncommitted()
48
59
    to_branch.lock_read()
49
60
    try:
50
61
        _set_branch_location(control_dir, to_branch, force)
51
62
    finally:
52
63
        to_branch.unlock()
53
64
    tree = control_dir.open_workingtree()
54
 
    _update(tree, source_repository, quiet, revision_id)
 
65
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
55
66
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
56
67
 
57
68
def _check_pending_merges(control, force=False):
151
162
    return False
152
163
 
153
164
 
154
 
def _update(tree, source_repository, quiet=False, revision_id=None):
 
165
def _update(tree, source_repository, quiet=False, revision_id=None,
 
166
            restore_uncommitted=False):
155
167
    """Update a working tree to the latest revision of its branch.
156
168
 
157
169
    :param tree: the working tree
158
170
    :param source_repository: repository holding the revisions
 
171
    :param restore_uncommitted: restore any uncommitted changes in the branch.
159
172
    """
160
 
    tree.lock_tree_write()
 
173
    if restore_uncommitted:
 
174
        tree.lock_write()
 
175
    else:
 
176
        tree.lock_tree_write()
161
177
    try:
162
178
        to_branch = tree.branch
163
179
        if revision_id is None:
165
181
        if tree.last_revision() == revision_id:
166
182
            if not quiet:
167
183
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
168
 
            return
169
 
        base_tree = source_repository.revision_tree(tree.last_revision())
170
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
171
 
        tree.set_last_revision(to_branch.last_revision())
172
 
        if not quiet:
173
 
            note(gettext('Updated to 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()
174
193
    finally:
175
194
        tree.unlock()