/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,
7290.26.5 by Jelmer Vernooij
Make some tests happy.
43
           store_uncommitted=False, possible_transports=None):
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
    """
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
53
    try:
54
        tree = control_dir.open_workingtree()
55
    except errors.NotBranchError as ex:
56
        # Lightweight checkout and branch is no longer there
57
        if not force or store_uncommitted:
58
            raise ex
59
        else:
60
            tree = None
61
    else:
62
        if store_uncommitted or tree.branch.get_bound_location():
63
            tree.lock_write()
64
        else:
65
            tree.lock_tree_write()
66
    try:
67
        if tree is not None:
68
            parent_ids = tree.get_parent_ids()
69
            if len(parent_ids) > 1:
70
                raise errors.BzrCommandError(
71
                    gettext('Pending merges must be '
72
                            'committed or reverted before using switch.'))
73
74
        if store_uncommitted:
6538.1.20 by Aaron Bentley
Cleanup
75
            tree.store_uncommitted()
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
76
        if tree is None:
77
            source_repository = to_branch.repository
78
            base_revision_id = None
79
        else:
80
            source_repository = tree.branch.repository
81
            # Attempt to retrieve the base_revision_id now, since some
82
            # working tree formats (i.e. git) don't have their own
83
            # last_revision but just use that of the currently active branch.
84
            base_revision_id = tree.last_revision()
85
    finally:
86
        if tree is not None:
87
            tree.unlock()
6754.8.4 by Jelmer Vernooij
Use new context stuff.
88
    with to_branch.lock_read():
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
89
        _set_branch_location(control_dir, to_branch, tree.branch if tree else None, force)
6538.1.28 by Aaron Bentley
Avoid branch write lock to preserve VFS call count.
90
    tree = control_dir.open_workingtree()
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
91
    if store_uncommitted:
92
        tree.lock_write()
93
    else:
94
        tree.lock_tree_write()
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
95
    try:
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
96
        if base_revision_id is None:
97
            # If we couldn't get to the tree's last_revision earlier, perhaps
98
            # we can now.
99
            base_revision_id = tree.last_revision()
100
        if revision_id is None:
101
            revision_id = to_branch.last_revision()
102
        if base_revision_id == revision_id:
103
            if not quiet:
104
                note(gettext("Tree is up to date at revision %d."),
105
                     to_branch.revno())
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
106
        else:
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
107
            base_tree = source_repository.revision_tree(base_revision_id)
108
            target_tree = to_branch.repository.revision_tree(revision_id)
109
            merge.Merge3Merger(tree, tree, base_tree, target_tree)
110
            tree.set_last_revision(revision_id)
111
            if not quiet:
112
                note(gettext('Updated to revision %d.') % to_branch.revno())
113
        if store_uncommitted:
114
            tree.restore_uncommitted()
115
        _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
116
    finally:
117
        tree.unlock()
118
119
120
def _set_branch_location(control, to_branch, current_branch, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
121
    """Set location value of a branch reference.
122
6207.3.3 by jelmer at samba
Fix tests and the like.
123
    :param control: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
124
    :param to_branch: branch that the checkout is to reference
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
125
    :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
126
    """
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
127
    branch_format = control.find_branch_format()
128
    if branch_format.get_reference(control) is not None:
129
        # Lightweight checkout: update the branch reference
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
130
        branch_format.set_reference(control, None, to_branch)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
131
    else:
7143.18.1 by Jelmer Vernooij
Fix 'bzr switch' in git repositories.
132
        b = current_branch
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
133
        bound_branch = b.get_bound_location()
134
        if bound_branch is not None:
135
            # Heavyweight checkout: check all local commits
136
            # have been pushed to the current bound branch then
137
            # synchronise the local branch with the new remote branch
138
            # and bind to it
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
139
            possible_transports = []
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
140
            try:
141
                if not force and _any_local_commits(b, possible_transports):
6138.3.8 by Jonathan Riddell
more error gettext()ing
142
                    raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
143
                        'Cannot switch as local commits found in the checkout. '
144
                        'Commit these to the bound branch or use --force to '
6138.3.8 by Jonathan Riddell
more error gettext()ing
145
                        'throw them away.'))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
146
            except errors.BoundBranchConnectionFailure as e:
6138.3.8 by Jonathan Riddell
more error gettext()ing
147
                raise errors.BzrCommandError(gettext(
7143.15.2 by Jelmer Vernooij
Run autopep8.
148
                    'Unable to connect to current master branch %(target)s: '
149
                    '%(error)s To switch anyway, use --force.') %
150
                    e.__dict__)
7290.26.1 by Jelmer Vernooij
Fix switching in git repositories.
151
            with b.lock_write():
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.
152
                b.set_bound_location(None)
153
                b.pull(to_branch, overwrite=True,
154
                       possible_transports=possible_transports)
155
                b.set_bound_location(to_branch.base)
156
                b.set_parent(b.get_master_branch().get_parent())
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
157
        else:
6437.7.5 by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch.
158
            # If this is a standalone tree and the new branch
159
            # is derived from this one, create a lightweight checkout.
6754.8.4 by Jelmer Vernooij
Use new context stuff.
160
            with b.lock_read():
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
161
                graph = b.repository.get_graph(to_branch.repository)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
162
                if (b.controldir._format.colocated_branches and
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
163
                    (force or graph.is_ancestor(
164
                        b.last_revision(), to_branch.last_revision()))):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
165
                    b.controldir.destroy_branch()
166
                    b.controldir.set_branch_reference(to_branch, name="")
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
167
                else:
7143.15.5 by Jelmer Vernooij
More PEP8 fixes.
168
                    raise errors.BzrCommandError(
169
                        gettext('Cannot switch a branch, only a checkout.'))
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
170
171
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
172
def _any_local_commits(this_branch, possible_transports):
173
    """Does this branch have any commits not in the master branch?"""
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
174
    last_rev = revision.ensure_null(this_branch.last_revision())
175
    if last_rev != revision.NULL_REVISION:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
176
        other_branch = this_branch.get_master_branch(possible_transports)
6754.8.4 by Jelmer Vernooij
Use new context stuff.
177
        with this_branch.lock_read(), other_branch.lock_read():
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
178
            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
179
            graph = this_branch.repository.get_graph(
180
                other_branch.repository)
181
            if not graph.is_ancestor(last_rev, other_last_rev):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
182
                return True
183
    return False