/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
4763.2.4 by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry.
1
# Copyright (C) 2007, 2009, 2010 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
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
19
from bzrlib import errors, merge, revision
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
20
from bzrlib.trace import note
21
22
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
23
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
24
    """Switch the branch associated with a checkout.
25
26
    :param control_dir: BzrDir of the checkout to change
27
    :param to_branch: branch that the checkout is to reference
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
28
    :param force: skip the check for local commits in a heavy checkout
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
29
    :param revision_id: revision ID to switch to.
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
30
    """
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
31
    _check_pending_merges(control_dir, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
32
    try:
33
        source_repository = control_dir.open_branch().repository
34
    except errors.NotBranchError:
35
        source_repository = to_branch.repository
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
36
    _set_branch_location(control_dir, to_branch, force)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
37
    tree = control_dir.open_workingtree()
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
38
    _update(tree, source_repository, quiet, revision_id)
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
39
40
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
41
def _check_pending_merges(control, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
42
    """Check that there are no outstanding pending merges before switching.
43
44
    :param control: BzrDir of the branch to check
45
    """
46
    try:
47
        tree = control.open_workingtree()
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
48
    except errors.NotBranchError, ex:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
49
        # Lightweight checkout and branch is no longer there
3078.2.5 by Ian Clatworthy
make switch fail without --force if branch missing
50
        if force:
51
            return
52
        else:
53
            raise ex
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
54
    # XXX: Should the tree be locked for get_parent_ids?
55
    existing_pending_merges = tree.get_parent_ids()[1:]
56
    if len(existing_pending_merges) > 0:
57
        raise errors.BzrCommandError('Pending merges must be '
58
            'committed or reverted before using switch.')
59
60
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
61
def _set_branch_location(control, to_branch, force=False):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
62
    """Set location value of a branch reference.
63
64
    :param control: BzrDir of the checkout to change
65
    :param to_branch: branch that the checkout is to reference
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
66
    :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
67
    """
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
68
    branch_format = control.find_branch_format()
69
    if branch_format.get_reference(control) is not None:
70
        # Lightweight checkout: update the branch reference
71
        branch_format.set_reference(control, to_branch)
72
    else:
73
        b = control.open_branch()
74
        bound_branch = b.get_bound_location()
75
        if bound_branch is not None:
76
            # Heavyweight checkout: check all local commits
77
            # have been pushed to the current bound branch then
78
            # synchronise the local branch with the new remote branch
79
            # and bind to it
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
80
            possible_transports = []
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
81
            try:
82
                if not force and _any_local_commits(b, possible_transports):
83
                    raise errors.BzrCommandError(
84
                        'Cannot switch as local commits found in the checkout. '
85
                        'Commit these to the bound branch or use --force to '
86
                        'throw them away.')
87
            except errors.BoundBranchConnectionFailure, e:
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
88
                raise errors.BzrCommandError(
4340.1.1 by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch.
89
                        'Unable to connect to current master branch %(target)s: '
90
                        '%(error)s To switch anyway, use --force.' %
91
                        e.__dict__)
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
92
            b.set_bound_location(None)
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
93
            b.pull(to_branch, overwrite=True,
94
                possible_transports=possible_transports)
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
95
            b.set_bound_location(to_branch.base)
96
        else:
97
            raise errors.BzrCommandError('Cannot switch a branch, '
98
                'only a checkout.')
99
100
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
101
def _any_local_commits(this_branch, possible_transports):
102
    """Does this branch have any commits not in the master branch?"""
3078.2.2 by Ian Clatworthy
get switch tests passing on heavyweight checkouts
103
    last_rev = revision.ensure_null(this_branch.last_revision())
104
    if last_rev != revision.NULL_REVISION:
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
105
        other_branch = this_branch.get_master_branch(possible_transports)
106
        this_branch.lock_read()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
107
        other_branch.lock_read()
108
        try:
109
            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
110
            graph = this_branch.repository.get_graph(
111
                other_branch.repository)
112
            if not graph.is_ancestor(last_rev, other_last_rev):
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
113
                return True
114
        finally:
115
            other_branch.unlock()
3078.2.6 by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review
116
            this_branch.unlock()
3078.2.1 by Ian Clatworthy
Refactor switch to support heavyweight checkouts
117
    return False
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
118
119
3984.5.19 by Andrew Bennetts
Merge lp:bzr, resolving conflicts.
120
def _update(tree, source_repository, quiet=False, revision_id=None):
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
121
    """Update a working tree to the latest revision of its branch.
122
123
    :param tree: the working tree
124
    :param source_repository: repository holding the revisions
125
    """
126
    tree.lock_tree_write()
127
    try:
128
        to_branch = tree.branch
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
129
        if revision_id is None:
130
            revision_id = to_branch.last_revision()
131
        if tree.last_revision() == revision_id:
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
132
            if not quiet:
133
                note("Tree is up to date at revision %d.", to_branch.revno())
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
134
            return
135
        base_tree = source_repository.revision_tree(tree.last_revision())
3984.5.4 by Daniel Watkins
Implement use of a revision at the bzrlib.switch level.
136
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
137
        tree.set_last_revision(to_branch.last_revision())
4459.4.1 by Aaron Bentley
Provide control over switch and shelver messaging.
138
        if not quiet:
139
            note('Updated to revision %d.' % to_branch.revno())
2999.1.5 by Ian Clatworthy
make switch.py unix file format, not dos
140
    finally:
141
        tree.unlock()