/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
1
# Copyright (C) 2007, 2009-2012 Canonical Ltd.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
2
#
3
# This program is free software; you can redistribute it and/or modify
4
# it under the terms of the GNU General Public License as published by
5
# the Free Software Foundation; either version 2 of the License, or
6
# (at your option) any later version.
7
#
8
# This program is distributed in the hope that it will be useful,
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
11
# GNU General Public License for more details.
12
#
13
# You should have received a copy of the GNU General Public License
14
# along with this program; if not, write to the Free Software
4183.7.1 by Sabin Iacob
update FSF mailing address
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
16
6379.6.3 by Jelmer Vernooij
Use absolute_import.
17
from __future__ import absolute_import
18
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
19
# Original author: David Allouche
20
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
21
from . import (
6538.1.20 by Aaron Bentley
Cleanup
22
    errors,
23
    lock,
24
    merge,
25
    revision
26
    )
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
27
from .branch import Branch
28
from .i18n import gettext
29
from .trace import note
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
30
7143.15.2 by Jelmer Vernooij
Run autopep8.
31
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
32
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
33
    from .branch import SwitchHookParams
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
34
    hooks = Branch.hooks['post_switch']
35
    if not hooks:
36
        return
37
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
38
    for hook in hooks:
39
        hook(params)
40
7143.15.2 by Jelmer Vernooij
Run autopep8.
41
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
42
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
43
           store_uncommitted=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
44
    """Switch the branch associated with a checkout.
45
6207.3.3 by jelmer at samba
Fix tests and the like.
46
    :param control_dir: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
47
    :param to_branch: branch that the checkout is to reference
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
48
    :param force: skip the check for local commits in a heavy checkout
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
49
    :param revision_id: revision ID to switch to.
6538.1.20 by Aaron Bentley
Cleanup
50
    :param store_uncommitted: If True, store uncommitted changes in the
51
        branch.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
52
    """
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
53
    _check_pending_merges(control_dir, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
54
    try:
55
        source_repository = control_dir.open_branch().repository
56
    except errors.NotBranchError:
57
        source_repository = to_branch.repository
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
58
    if store_uncommitted:
6538.1.20 by Aaron Bentley
Cleanup
59
        with lock.write_locked(control_dir.open_workingtree()) as tree:
60
            tree.store_uncommitted()
6754.8.4 by Jelmer Vernooij
Use new context stuff.
61
    with to_branch.lock_read():
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
62
        _set_branch_location(control_dir, to_branch, force)
6538.1.28 by Aaron Bentley
Avoid branch write lock to preserve VFS call count.
63
    tree = control_dir.open_workingtree()
64
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
65
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
66
7143.15.2 by Jelmer Vernooij
Run autopep8.
67
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
68
def _check_pending_merges(control, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
69
    """Check that there are no outstanding pending merges before switching.
70
6207.3.3 by jelmer at samba
Fix tests and the like.
71
    :param control: ControlDir of the branch to check
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
72
    """
73
    try:
74
        tree = control.open_workingtree()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
75
    except errors.NotBranchError as ex:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
76
        # Lightweight checkout and branch is no longer there
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
77
        if force:
78
            return
79
        else:
80
            raise ex
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
81
    # XXX: Should the tree be locked for get_parent_ids?
82
    existing_pending_merges = tree.get_parent_ids()[1:]
83
    if len(existing_pending_merges) > 0:
6138.3.8 by Jonathan Riddell
more error gettext()ing
84
        raise errors.BzrCommandError(gettext('Pending merges must be '
7143.15.2 by Jelmer Vernooij
Run autopep8.
85
                                             'committed or reverted before using switch.'))
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
86
87
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
88
def _set_branch_location(control, to_branch, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
89
    """Set location value of a branch reference.
90
6207.3.3 by jelmer at samba
Fix tests and the like.
91
    :param control: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
92
    :param to_branch: branch that the checkout is to reference
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
93
    :param force: skip the check for local commits in a heavy checkout
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
94
    """
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
95
    branch_format = control.find_branch_format()
96
    if branch_format.get_reference(control) is not None:
97
        # Lightweight checkout: update the branch reference
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
98
        branch_format.set_reference(control, None, to_branch)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
99
    else:
100
        b = control.open_branch()
101
        bound_branch = b.get_bound_location()
102
        if bound_branch is not None:
103
            # Heavyweight checkout: check all local commits
104
            # have been pushed to the current bound branch then
105
            # synchronise the local branch with the new remote branch
106
            # and bind to it
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
107
            possible_transports = []
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
108
            try:
109
                if not force and _any_local_commits(b, possible_transports):
6138.3.8 by Jonathan Riddell
more error gettext()ing
110
                    raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
111
                        'Cannot switch as local commits found in the checkout. '
112
                        'Commit these to the bound branch or use --force to '
6138.3.8 by Jonathan Riddell
more error gettext()ing
113
                        'throw them away.'))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
114
            except errors.BoundBranchConnectionFailure as e:
6138.3.8 by Jonathan Riddell
more error gettext()ing
115
                raise errors.BzrCommandError(gettext(
7143.15.2 by Jelmer Vernooij
Run autopep8.
116
                    'Unable to connect to current master branch %(target)s: '
117
                    '%(error)s To switch anyway, use --force.') %
118
                    e.__dict__)
6404.6.1 by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made.
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()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
128
        else:
6437.7.5 by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch.
129
            # If this is a standalone tree and the new branch
130
            # is derived from this one, create a lightweight checkout.
6754.8.4 by Jelmer Vernooij
Use new context stuff.
131
            with b.lock_read():
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
132
                graph = b.repository.get_graph(to_branch.repository)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
133
                if (b.controldir._format.colocated_branches and
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
134
                    (force or graph.is_ancestor(
135
                        b.last_revision(), to_branch.last_revision()))):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
136
                    b.controldir.destroy_branch()
137
                    b.controldir.set_branch_reference(to_branch, name="")
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
138
                else:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
139
                    raise errors.BzrCommandError(
140
                        gettext('Cannot switch a branch, only a checkout.'))
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
141
142
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
143
def _any_local_commits(this_branch, possible_transports):
144
    """Does this branch have any commits not in the master branch?"""
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
145
    last_rev = revision.ensure_null(this_branch.last_revision())
146
    if last_rev != revision.NULL_REVISION:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
147
        other_branch = this_branch.get_master_branch(possible_transports)
6754.8.4 by Jelmer Vernooij
Use new context stuff.
148
        with this_branch.lock_read(), other_branch.lock_read():
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
149
            other_last_rev = other_branch.last_revision()
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
150
            graph = this_branch.repository.get_graph(
151
                other_branch.repository)
152
            if not graph.is_ancestor(last_rev, other_last_rev):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
153
                return True
154
    return False
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
155
156
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
157
def _update(tree, source_repository, quiet=False, revision_id=None,
158
            restore_uncommitted=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
159
    """Update a working tree to the latest revision of its branch.
160
161
    :param tree: the working tree
162
    :param source_repository: repository holding the revisions
6538.1.20 by Aaron Bentley
Cleanup
163
    :param restore_uncommitted: restore any uncommitted changes in the branch.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
164
    """
6538.1.28 by Aaron Bentley
Avoid branch write lock to preserve VFS call count.
165
    if restore_uncommitted:
166
        tree.lock_write()
167
    else:
168
        tree.lock_tree_write()
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
169
    try:
170
        to_branch = tree.branch
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
171
        if revision_id is None:
172
            revision_id = to_branch.last_revision()
173
        if tree.last_revision() == revision_id:
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
174
            if not quiet:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
175
                note(gettext("Tree is up to date at revision %d."),
176
                     to_branch.revno())
6538.1.16 by Aaron Bentley
Restore uncommitted changes even if revisions are same.
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())
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
184
        if restore_uncommitted:
185
            tree.restore_uncommitted()
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
186
    finally:
187
        tree.unlock()