← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Martin Packman
  • Date: 2012-02-01 13:24:42 UTC
  • mto: (6437.23.4 2.5)
  • mto: This revision was merged to the branch mainline in revision 6462.
  • Revision ID: martin.packman@canonical.com-20120201132442-ela7jc4mxv4b058o
https://launchpad.net/bugs/312841
Treat path for .bzr.log as unicode

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
18
18
 
19
19
# Original author: David Allouche
20
20
 
21
 
from bzrlib import (
22
 
    errors,
23
 
    lock,
24
 
    merge,
25
 
    revision
26
 
    )
 
21
from bzrlib import errors, merge, revision
27
22
from bzrlib.branch import Branch
28
23
from bzrlib.i18n import gettext
29
24
from bzrlib.trace import note
37
32
    for hook in hooks:
38
33
        hook(params)
39
34
 
40
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
41
 
           store_uncommitted=False):
 
35
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
42
36
    """Switch the branch associated with a checkout.
43
37
 
44
38
    :param control_dir: ControlDir of the checkout to change
45
39
    :param to_branch: branch that the checkout is to reference
46
40
    :param force: skip the check for local commits in a heavy checkout
47
41
    :param revision_id: revision ID to switch to.
48
 
    :param store_uncommitted: If True, store uncommitted changes in the
49
 
        branch.
50
42
    """
51
43
    _check_pending_merges(control_dir, force)
52
44
    try:
53
45
        source_repository = control_dir.open_branch().repository
54
46
    except errors.NotBranchError:
55
47
        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
48
    to_branch.lock_read()
60
49
    try:
61
50
        _set_branch_location(control_dir, to_branch, force)
62
51
    finally:
63
52
        to_branch.unlock()
64
53
    tree = control_dir.open_workingtree()
65
 
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
 
54
    _update(tree, source_repository, quiet, revision_id)
66
55
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
67
56
 
68
57
def _check_pending_merges(control, force=False):
116
105
                        'Unable to connect to current master branch %(target)s: '
117
106
                        '%(error)s To switch anyway, use --force.') %
118
107
                        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()
 
108
            b.set_bound_location(None)
 
109
            b.pull(to_branch, overwrite=True,
 
110
                possible_transports=possible_transports)
 
111
            b.set_bound_location(to_branch.base)
 
112
            b.set_parent(b.get_master_branch().get_parent())
128
113
        else:
129
114
            # If this is a standalone tree and the new branch
130
115
            # is derived from this one, create a lightweight checkout.
162
147
    return False
163
148
 
164
149
 
165
 
def _update(tree, source_repository, quiet=False, revision_id=None,
166
 
            restore_uncommitted=False):
 
150
def _update(tree, source_repository, quiet=False, revision_id=None):
167
151
    """Update a working tree to the latest revision of its branch.
168
152
 
169
153
    :param tree: the working tree
170
154
    :param source_repository: repository holding the revisions
171
 
    :param restore_uncommitted: restore any uncommitted changes in the branch.
172
155
    """
173
 
    if restore_uncommitted:
174
 
        tree.lock_write()
175
 
    else:
176
 
        tree.lock_tree_write()
 
156
    tree.lock_tree_write()
177
157
    try:
178
158
        to_branch = tree.branch
179
159
        if revision_id is None:
181
161
        if tree.last_revision() == revision_id:
182
162
            if not quiet:
183
163
                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()
 
164
            return
 
165
        base_tree = source_repository.revision_tree(tree.last_revision())
 
166
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
 
167
        tree.set_last_revision(to_branch.last_revision())
 
168
        if not quiet:
 
169
            note(gettext('Updated to revision %d.') % to_branch.revno())
193
170
    finally:
194
171
        tree.unlock()