/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/switch.py

  • Committer: Ian Clatworthy
  • Date: 2007-12-05 12:54:14 UTC
  • mto: (3092.1.1 ianc-integration)
  • mto: This revision was merged to the branch mainline in revision 3093.
  • Revision ID: ian.clatworthy@internode.on.net-20071205125414-pmgapgkgx7vpi33y
Add NEWS

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009, 2010 Canonical Ltd.
 
1
# Copyright (C) 2006, 2007 Canonical Ltd.
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
# Original author: David Allouche
18
18
 
19
19
from bzrlib import errors, merge, revision
20
 
from bzrlib.branch import Branch
 
20
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
 
21
from bzrlib.bzrdir import BzrDir
21
22
from bzrlib.trace import note
22
23
 
23
24
 
24
 
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
25
 
    from bzrlib.branch import SwitchHookParams
26
 
    hooks = Branch.hooks['post_switch']
27
 
    if not hooks:
28
 
        return
29
 
    params = SwitchHookParams(control_dir, to_branch, force, revision_id)
30
 
    for hook in hooks:
31
 
        hook(params)
32
 
 
33
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None):
 
25
def switch(control_dir, to_branch, force=False):
34
26
    """Switch the branch associated with a checkout.
35
27
 
36
28
    :param control_dir: BzrDir of the checkout to change
37
29
    :param to_branch: branch that the checkout is to reference
38
30
    :param force: skip the check for local commits in a heavy checkout
39
 
    :param revision_id: revision ID to switch to.
40
31
    """
41
 
    _check_pending_merges(control_dir, force)
 
32
    _check_pending_merges(control_dir)
42
33
    try:
43
34
        source_repository = control_dir.open_branch().repository
44
35
    except errors.NotBranchError:
45
36
        source_repository = to_branch.repository
46
37
    _set_branch_location(control_dir, to_branch, force)
47
38
    tree = control_dir.open_workingtree()
48
 
    _update(tree, source_repository, quiet, revision_id)
49
 
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
50
 
 
51
 
def _check_pending_merges(control, force=False):
 
39
    _update(tree, source_repository)
 
40
 
 
41
 
 
42
def _check_pending_merges(control):
52
43
    """Check that there are no outstanding pending merges before switching.
53
44
 
54
45
    :param control: BzrDir of the branch to check
55
46
    """
56
47
    try:
57
48
        tree = control.open_workingtree()
58
 
    except errors.NotBranchError, ex:
59
 
        # Lightweight checkout and branch is no longer there
60
 
        if force:
61
 
            return
62
 
        else:
63
 
            raise ex
 
49
    except errors.NotBranchError:
 
50
        # old branch is gone
 
51
        return
64
52
    # XXX: Should the tree be locked for get_parent_ids?
65
53
    existing_pending_merges = tree.get_parent_ids()[1:]
66
54
    if len(existing_pending_merges) > 0:
87
75
            # have been pushed to the current bound branch then
88
76
            # synchronise the local branch with the new remote branch
89
77
            # and bind to it
90
 
            possible_transports = []
91
 
            try:
92
 
                if not force and _any_local_commits(b, possible_transports):
93
 
                    raise errors.BzrCommandError(
94
 
                        'Cannot switch as local commits found in the checkout. '
95
 
                        'Commit these to the bound branch or use --force to '
96
 
                        'throw them away.')
97
 
            except errors.BoundBranchConnectionFailure, e:
 
78
            if not force and _any_local_commits(b, bound_branch):
98
79
                raise errors.BzrCommandError(
99
 
                        'Unable to connect to current master branch %(target)s: '
100
 
                        '%(error)s To switch anyway, use --force.' %
101
 
                        e.__dict__)
 
80
                    'Cannot switch as local commits found in the checkout. '
 
81
                    'Commit these to the bound branch or use --force to '
 
82
                    'throw them away.')
102
83
            b.set_bound_location(None)
103
 
            b.pull(to_branch, overwrite=True,
104
 
                possible_transports=possible_transports)
 
84
            b.pull(to_branch, overwrite=True)
105
85
            b.set_bound_location(to_branch.base)
106
86
        else:
107
87
            raise errors.BzrCommandError('Cannot switch a branch, '
108
88
                'only a checkout.')
109
89
 
110
90
 
111
 
def _any_local_commits(this_branch, possible_transports):
112
 
    """Does this branch have any commits not in the master branch?"""
 
91
def _any_local_commits(this_branch, other_branch_url):
 
92
    """Does this branch have any commits not in the other branch?"""
113
93
    last_rev = revision.ensure_null(this_branch.last_revision())
114
94
    if last_rev != revision.NULL_REVISION:
115
 
        other_branch = this_branch.get_master_branch(possible_transports)
116
 
        this_branch.lock_read()
 
95
        a_bzrdir, relpath = BzrDir.open_containing(other_branch_url)
 
96
        other_branch = a_bzrdir.open_branch()
117
97
        other_branch.lock_read()
118
98
        try:
119
99
            other_last_rev = other_branch.last_revision()
120
 
            graph = this_branch.repository.get_graph(
121
 
                other_branch.repository)
122
 
            if not graph.is_ancestor(last_rev, other_last_rev):
 
100
            remote_graph = other_branch.repository.get_revision_graph(
 
101
                other_last_rev)
 
102
            if last_rev not in remote_graph:
123
103
                return True
124
104
        finally:
125
105
            other_branch.unlock()
126
 
            this_branch.unlock()
127
106
    return False
128
107
 
129
108
 
130
 
def _update(tree, source_repository, quiet=False, revision_id=None):
 
109
def _update(tree, source_repository):
131
110
    """Update a working tree to the latest revision of its branch.
132
111
 
133
112
    :param tree: the working tree
136
115
    tree.lock_tree_write()
137
116
    try:
138
117
        to_branch = tree.branch
139
 
        if revision_id is None:
140
 
            revision_id = to_branch.last_revision()
141
 
        if tree.last_revision() == revision_id:
142
 
            if not quiet:
143
 
                note("Tree is up to date at revision %d.", to_branch.revno())
 
118
        if tree.last_revision() == to_branch.last_revision():
 
119
            note("Tree is up to date at revision %d.", to_branch.revno())
144
120
            return
145
121
        base_tree = source_repository.revision_tree(tree.last_revision())
146
 
        merge.Merge3Merger(tree, tree, base_tree, to_branch.repository.revision_tree(revision_id))
 
122
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
147
123
        tree.set_last_revision(to_branch.last_revision())
148
 
        if not quiet:
149
 
            note('Updated to revision %d.' % to_branch.revno())
 
124
        note('Updated to revision %d.' % to_branch.revno())
150
125
    finally:
151
126
        tree.unlock()