/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
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
31
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
6624 by Jelmer Vernooij
Merge Python3 porting work ('py3 pokes')
32
    from .branch import SwitchHookParams
5107.3.1 by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init',
33
    hooks = Branch.hooks['post_switch']
34
    if not hooks:
35
        return
36
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
37
    for hook in hooks:
38
        hook(params)
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,
41
           store_uncommitted=False):
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
    """
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
51
    _check_pending_merges(control_dir, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
52
    try:
53
        source_repository = control_dir.open_branch().repository
54
    except errors.NotBranchError:
55
        source_repository = to_branch.repository
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
56
    if store_uncommitted:
6538.1.20 by Aaron Bentley
Cleanup
57
        with lock.write_locked(control_dir.open_workingtree()) as tree:
58
            tree.store_uncommitted()
6754.8.4 by Jelmer Vernooij
Use new context stuff.
59
    with to_branch.lock_read():
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
60
        _set_branch_location(control_dir, to_branch, force)
6538.1.28 by Aaron Bentley
Avoid branch write lock to preserve VFS call count.
61
    tree = control_dir.open_workingtree()
62
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
5107.3.4 by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel):
63
    _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
64
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
65
def _check_pending_merges(control, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
66
    """Check that there are no outstanding pending merges before switching.
67
6207.3.3 by jelmer at samba
Fix tests and the like.
68
    :param control: ControlDir of the branch to check
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
69
    """
70
    try:
71
        tree = control.open_workingtree()
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
72
    except errors.NotBranchError as ex:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
73
        # Lightweight checkout and branch is no longer there
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
74
        if force:
75
            return
76
        else:
77
            raise ex
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
78
    # XXX: Should the tree be locked for get_parent_ids?
79
    existing_pending_merges = tree.get_parent_ids()[1:]
80
    if len(existing_pending_merges) > 0:
6138.3.8 by Jonathan Riddell
more error gettext()ing
81
        raise errors.BzrCommandError(gettext('Pending merges must be '
82
            'committed or reverted before using switch.'))
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
83
84
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
85
def _set_branch_location(control, to_branch, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
86
    """Set location value of a branch reference.
87
6207.3.3 by jelmer at samba
Fix tests and the like.
88
    :param control: ControlDir of the checkout to change
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
89
    :param to_branch: branch that the checkout is to reference
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
90
    :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
91
    """
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
92
    branch_format = control.find_branch_format()
93
    if branch_format.get_reference(control) is not None:
94
        # Lightweight checkout: update the branch reference
5147.4.4 by Jelmer Vernooij
Support colocated branches in BranchReference.
95
        branch_format.set_reference(control, None, to_branch)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
96
    else:
97
        b = control.open_branch()
98
        bound_branch = b.get_bound_location()
99
        if bound_branch is not None:
100
            # Heavyweight checkout: check all local commits
101
            # have been pushed to the current bound branch then
102
            # synchronise the local branch with the new remote branch
103
            # and bind to it
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
104
            possible_transports = []
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
105
            try:
106
                if not force and _any_local_commits(b, possible_transports):
6138.3.8 by Jonathan Riddell
more error gettext()ing
107
                    raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
108
                        'Cannot switch as local commits found in the checkout. '
109
                        'Commit these to the bound branch or use --force to '
6138.3.8 by Jonathan Riddell
more error gettext()ing
110
                        'throw them away.'))
6619.3.2 by Jelmer Vernooij
Apply 2to3 except fix.
111
            except errors.BoundBranchConnectionFailure as e:
6138.3.8 by Jonathan Riddell
more error gettext()ing
112
                raise errors.BzrCommandError(gettext(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
113
                        'Unable to connect to current master branch %(target)s: '
6138.3.8 by Jonathan Riddell
more error gettext()ing
114
                        '%(error)s To switch anyway, use --force.') %
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
115
                        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.
116
            b.lock_write()
117
            try:
118
                b.set_bound_location(None)
119
                b.pull(to_branch, overwrite=True,
120
                       possible_transports=possible_transports)
121
                b.set_bound_location(to_branch.base)
122
                b.set_parent(b.get_master_branch().get_parent())
123
            finally:
124
                b.unlock()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
125
        else:
6437.7.5 by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch.
126
            # If this is a standalone tree and the new branch
127
            # is derived from this one, create a lightweight checkout.
6754.8.4 by Jelmer Vernooij
Use new context stuff.
128
            with b.lock_read():
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
129
                graph = b.repository.get_graph(to_branch.repository)
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
130
                if (b.controldir._format.colocated_branches and
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
131
                     (force or graph.is_ancestor(b.last_revision(),
132
                        to_branch.last_revision()))):
6653.6.1 by Jelmer Vernooij
Rename a number of attributes from bzrdir to controldir.
133
                    b.controldir.destroy_branch()
134
                    b.controldir.set_branch_reference(to_branch, name="")
6437.21.7 by Jelmer Vernooij
Fix remaining tests.
135
                else:
136
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
137
                        'only a checkout.'))
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
138
139
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
140
def _any_local_commits(this_branch, possible_transports):
141
    """Does this branch have any commits not in the master branch?"""
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
142
    last_rev = revision.ensure_null(this_branch.last_revision())
143
    if last_rev != revision.NULL_REVISION:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
144
        other_branch = this_branch.get_master_branch(possible_transports)
6754.8.4 by Jelmer Vernooij
Use new context stuff.
145
        with this_branch.lock_read(), other_branch.lock_read():
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
146
            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
147
            graph = this_branch.repository.get_graph(
148
                other_branch.repository)
149
            if not graph.is_ancestor(last_rev, other_last_rev):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
150
                return True
151
    return False
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
152
153
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
154
def _update(tree, source_repository, quiet=False, revision_id=None,
155
            restore_uncommitted=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
156
    """Update a working tree to the latest revision of its branch.
157
158
    :param tree: the working tree
159
    :param source_repository: repository holding the revisions
6538.1.20 by Aaron Bentley
Cleanup
160
    :param restore_uncommitted: restore any uncommitted changes in the branch.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
161
    """
6538.1.28 by Aaron Bentley
Avoid branch write lock to preserve VFS call count.
162
    if restore_uncommitted:
163
        tree.lock_write()
164
    else:
165
        tree.lock_tree_write()
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
166
    try:
167
        to_branch = tree.branch
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
168
        if revision_id is None:
169
            revision_id = to_branch.last_revision()
170
        if tree.last_revision() == revision_id:
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
171
            if not quiet:
6138.3.4 by Jonathan Riddell
add gettext() to uses of trace.note()
172
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
6538.1.16 by Aaron Bentley
Restore uncommitted changes even if revisions are same.
173
        else:
174
            base_tree = source_repository.revision_tree(tree.last_revision())
175
            merge.Merge3Merger(tree, tree, base_tree,
176
                               to_branch.repository.revision_tree(revision_id))
177
            tree.set_last_revision(to_branch.last_revision())
178
            if not quiet:
179
                note(gettext('Updated to revision %d.') % to_branch.revno())
6538.1.15 by Aaron Bentley
Switch.switch stores and restores changes.
180
        if restore_uncommitted:
181
            tree.restore_uncommitted()
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
182
    finally:
183
        tree.unlock()