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