/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 breezy/switch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 18:59:44 UTC
  • mfrom: (7143.15.15 more-cleanups)
  • Revision ID: breezy.the.bot@gmail.com-20181116185944-biefv1sub37qfybm
Sprinkle some PEP8iness.

Merged from https://code.launchpad.net/~jelmer/brz/more-cleanups/+merge/358611

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/switch.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd.
 
1
# Copyright (C) 2007, 2009-2012 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
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
 
17
19
# Original author: David Allouche
18
20
 
19
 
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch
21
 
from bzrlib.trace import note
 
21
from . import (
 
22
    errors,
 
23
    lock,
 
24
    merge,
 
25
    revision
 
26
    )
 
27
from .branch import Branch
 
28
from .i18n import gettext
 
29
from .trace import note
22
30
 
23
31
 
24
32
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
25
 
    from bzrlib.branch import SwitchHookParams
 
33
    from .branch import SwitchHookParams
26
34
    hooks = Branch.hooks['post_switch']
27
35
    if not hooks:
28
36
        return
30
38
    for hook in hooks:
31
39
        hook(params)
32
40
 
33
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
 
41
 
 
42
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
 
43
           store_uncommitted=False):
34
44
    """Switch the branch associated with a checkout.
35
45
 
36
 
    :param control_dir: BzrDir of the checkout to change
 
46
    :param control_dir: ControlDir of the checkout to change
37
47
    :param to_branch: branch that the checkout is to reference
38
48
    :param force: skip the check for local commits in a heavy checkout
39
49
    :param revision_id: revision ID to switch to.
 
50
    :param store_uncommitted: If True, store uncommitted changes in the
 
51
        branch.
40
52
    """
41
53
    _check_pending_merges(control_dir, force)
42
54
    try:
43
55
        source_repository = control_dir.open_branch().repository
44
56
    except errors.NotBranchError:
45
57
        source_repository = to_branch.repository
46
 
    _set_branch_location(control_dir, to_branch, force)
 
58
    if store_uncommitted:
 
59
        with lock.write_locked(control_dir.open_workingtree()) as tree:
 
60
            tree.store_uncommitted()
 
61
    with to_branch.lock_read():
 
62
        _set_branch_location(control_dir, to_branch, force)
47
63
    tree = control_dir.open_workingtree()
48
 
    _update(tree, source_repository, quiet, revision_id)
 
64
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
49
65
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
50
66
 
 
67
 
51
68
def _check_pending_merges(control, force=False):
52
69
    """Check that there are no outstanding pending merges before switching.
53
70
 
54
 
    :param control: BzrDir of the branch to check
 
71
    :param control: ControlDir of the branch to check
55
72
    """
56
73
    try:
57
74
        tree = control.open_workingtree()
58
 
    except errors.NotBranchError, ex:
 
75
    except errors.NotBranchError as ex:
59
76
        # Lightweight checkout and branch is no longer there
60
77
        if force:
61
78
            return
64
81
    # XXX: Should the tree be locked for get_parent_ids?
65
82
    existing_pending_merges = tree.get_parent_ids()[1:]
66
83
    if len(existing_pending_merges) > 0:
67
 
        raise errors.BzrCommandError('Pending merges must be '
68
 
            'committed or reverted before using switch.')
 
84
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
85
                                             'committed or reverted before using switch.'))
69
86
 
70
87
 
71
88
def _set_branch_location(control, to_branch, force=False):
72
89
    """Set location value of a branch reference.
73
90
 
74
 
    :param control: BzrDir of the checkout to change
 
91
    :param control: ControlDir of the checkout to change
75
92
    :param to_branch: branch that the checkout is to reference
76
93
    :param force: skip the check for local commits in a heavy checkout
77
94
    """
78
95
    branch_format = control.find_branch_format()
79
96
    if branch_format.get_reference(control) is not None:
80
97
        # Lightweight checkout: update the branch reference
81
 
        branch_format.set_reference(control, to_branch)
 
98
        branch_format.set_reference(control, None, to_branch)
82
99
    else:
83
100
        b = control.open_branch()
84
101
        bound_branch = b.get_bound_location()
90
107
            possible_transports = []
91
108
            try:
92
109
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
 
110
                    raise errors.BzrCommandError(gettext(
94
111
                        'Cannot switch as local commits found in the checkout. '
95
112
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
97
 
            except errors.BoundBranchConnectionFailure, e:
98
 
                raise errors.BzrCommandError(
99
 
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
101
 
                        e.__dict__)
102
 
            b.set_bound_location(None)
103
 
            b.pull(to_branch, overwrite=True,
104
 
                possible_transports=possible_transports)
105
 
            b.set_bound_location(to_branch.base)
 
113
                        'throw them away.'))
 
114
            except errors.BoundBranchConnectionFailure as e:
 
115
                raise errors.BzrCommandError(gettext(
 
116
                    'Unable to connect to current master branch %(target)s: '
 
117
                    '%(error)s To switch anyway, use --force.') %
 
118
                    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()
106
128
        else:
107
 
            raise errors.BzrCommandError('Cannot switch a branch, '
108
 
                'only a checkout.')
 
129
            # If this is a standalone tree and the new branch
 
130
            # is derived from this one, create a lightweight checkout.
 
131
            with b.lock_read():
 
132
                graph = b.repository.get_graph(to_branch.repository)
 
133
                if (b.controldir._format.colocated_branches and
 
134
                    (force or graph.is_ancestor(
 
135
                        b.last_revision(), to_branch.last_revision()))):
 
136
                    b.controldir.destroy_branch()
 
137
                    b.controldir.set_branch_reference(to_branch, name="")
 
138
                else:
 
139
                    raise errors.BzrCommandError(
 
140
                        gettext('Cannot switch a branch, only a checkout.'))
109
141
 
110
142
 
111
143
def _any_local_commits(this_branch, possible_transports):
113
145
    last_rev = revision.ensure_null(this_branch.last_revision())
114
146
    if last_rev != revision.NULL_REVISION:
115
147
        other_branch = this_branch.get_master_branch(possible_transports)
116
 
        this_branch.lock_read()
117
 
        other_branch.lock_read()
118
 
        try:
 
148
        with this_branch.lock_read(), other_branch.lock_read():
119
149
            other_last_rev = other_branch.last_revision()
120
150
            graph = this_branch.repository.get_graph(
121
151
                other_branch.repository)
122
152
            if not graph.is_ancestor(last_rev, other_last_rev):
123
153
                return True
124
 
        finally:
125
 
            other_branch.unlock()
126
 
            this_branch.unlock()
127
154
    return False
128
155
 
129
156
 
130
 
def _update(tree, source_repository, quiet=False, revision_id=None):
 
157
def _update(tree, source_repository, quiet=False, revision_id=None,
 
158
            restore_uncommitted=False):
131
159
    """Update a working tree to the latest revision of its branch.
132
160
 
133
161
    :param tree: the working tree
134
162
    :param source_repository: repository holding the revisions
 
163
    :param restore_uncommitted: restore any uncommitted changes in the branch.
135
164
    """
136
 
    tree.lock_tree_write()
 
165
    if restore_uncommitted:
 
166
        tree.lock_write()
 
167
    else:
 
168
        tree.lock_tree_write()
137
169
    try:
138
170
        to_branch = tree.branch
139
171
        if revision_id is None:
140
172
            revision_id = to_branch.last_revision()
141
173
        if tree.last_revision() == revision_id:
142
174
            if not quiet:
143
 
                note("Tree is up to date at revision %d.", to_branch.revno())
144
 
            return
145
 
        base_tree = source_repository.revision_tree(tree.last_revision())
146
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
147
 
        tree.set_last_revision(to_branch.last_revision())
148
 
        if not quiet:
149
 
            note('Updated to revision %d.' % to_branch.revno())
 
175
                note(gettext("Tree is up to date at revision %d."),
 
176
                     to_branch.revno())
 
177
        else:
 
178
            base_tree = source_repository.revision_tree(tree.last_revision())
 
179
            merge.Merge3Merger(tree, tree, base_tree,
 
180
                               to_branch.repository.revision_tree(revision_id))
 
181
            tree.set_last_revision(to_branch.last_revision())
 
182
            if not quiet:
 
183
                note(gettext('Updated to revision %d.') % to_branch.revno())
 
184
        if restore_uncommitted:
 
185
            tree.restore_uncommitted()
150
186
    finally:
151
187
        tree.unlock()