/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: John Ferlito
  • Date: 2009-09-02 04:31:45 UTC
  • mto: (4665.7.1 serve-init)
  • mto: This revision was merged to the branch mainline in revision 4913.
  • Revision ID: johnf@inodes.org-20090902043145-gxdsfw03ilcwbyn5
Add a debian init script for bzr --serve

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/switch.py
1
 
# Copyright (C) 2007, 2009-2012 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
16
16
 
17
17
# Original author: David Allouche
18
18
 
19
 
from . import (
20
 
    errors,
21
 
    lock,
22
 
    merge,
23
 
    revision
24
 
    )
25
 
from .branch import Branch
26
 
from .i18n import gettext
27
 
from .trace import note
28
 
 
29
 
 
30
 
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
31
 
    from .branch import SwitchHookParams
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
 
 
39
 
 
40
 
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
41
 
           store_uncommitted=False, possible_transports=None):
 
19
from bzrlib import errors, merge, revision
 
20
from bzrlib.branch import Branch, BranchFormat, BranchReferenceFormat
 
21
from bzrlib.bzrdir import BzrDir
 
22
from bzrlib.trace import note
 
23
 
 
24
 
 
25
def switch(control_dir, to_branch, force=False, quiet=False):
42
26
    """Switch the branch associated with a checkout.
43
27
 
44
 
    :param control_dir: ControlDir of the checkout to change
 
28
    :param control_dir: BzrDir of the checkout to change
45
29
    :param to_branch: branch that the checkout is to reference
46
30
    :param force: skip the check for local commits in a heavy checkout
47
 
    :param revision_id: revision ID to switch to.
48
 
    :param store_uncommitted: If True, store uncommitted changes in the
49
 
        branch.
50
 
    """
51
 
    try:
52
 
        tree = control_dir.open_workingtree()
53
 
    except errors.NotBranchError as ex:
 
31
    """
 
32
    _check_pending_merges(control_dir, force)
 
33
    try:
 
34
        source_repository = control_dir.open_branch().repository
 
35
    except errors.NotBranchError:
 
36
        source_repository = to_branch.repository
 
37
    _set_branch_location(control_dir, to_branch, force)
 
38
    tree = control_dir.open_workingtree()
 
39
    _update(tree, source_repository, quiet)
 
40
 
 
41
 
 
42
def _check_pending_merges(control, force=False):
 
43
    """Check that there are no outstanding pending merges before switching.
 
44
 
 
45
    :param control: BzrDir of the branch to check
 
46
    """
 
47
    try:
 
48
        tree = control.open_workingtree()
 
49
    except errors.NotBranchError, ex:
54
50
        # Lightweight checkout and branch is no longer there
55
 
        if not force or store_uncommitted:
 
51
        if force:
 
52
            return
 
53
        else:
56
54
            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:
68
 
                raise errors.CommandError(
69
 
                    gettext('Pending merges must be '
70
 
                            'committed or reverted before using switch.'))
71
 
 
72
 
        if store_uncommitted:
73
 
            tree.store_uncommitted()
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()
86
 
    with to_branch.lock_read():
87
 
        _set_branch_location(control_dir, to_branch, tree.branch if tree else None, force)
88
 
    tree = control_dir.open_workingtree()
89
 
    if store_uncommitted:
90
 
        tree.lock_write()
91
 
    else:
92
 
        tree.lock_tree_write()
93
 
    try:
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())
104
 
        else:
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):
 
55
    # XXX: Should the tree be locked for get_parent_ids?
 
56
    existing_pending_merges = tree.get_parent_ids()[1:]
 
57
    if len(existing_pending_merges) > 0:
 
58
        raise errors.BzrCommandError('Pending merges must be '
 
59
            'committed or reverted before using switch.')
 
60
 
 
61
 
 
62
def _set_branch_location(control, to_branch, force=False):
119
63
    """Set location value of a branch reference.
120
64
 
121
 
    :param control: ControlDir of the checkout to change
 
65
    :param control: BzrDir of the checkout to change
122
66
    :param to_branch: branch that the checkout is to reference
123
67
    :param force: skip the check for local commits in a heavy checkout
124
68
    """
125
69
    branch_format = control.find_branch_format()
126
70
    if branch_format.get_reference(control) is not None:
127
71
        # Lightweight checkout: update the branch reference
128
 
        branch_format.set_reference(control, None, to_branch)
 
72
        branch_format.set_reference(control, to_branch)
129
73
    else:
130
 
        b = current_branch
 
74
        b = control.open_branch()
131
75
        bound_branch = b.get_bound_location()
132
76
        if bound_branch is not None:
133
77
            # Heavyweight checkout: check all local commits
137
81
            possible_transports = []
138
82
            try:
139
83
                if not force and _any_local_commits(b, possible_transports):
140
 
                    raise errors.CommandError(gettext(
 
84
                    raise errors.BzrCommandError(
141
85
                        'Cannot switch as local commits found in the checkout. '
142
86
                        'Commit these to the bound branch or use --force to '
143
 
                        'throw them away.'))
144
 
            except errors.BoundBranchConnectionFailure as e:
145
 
                raise errors.CommandError(gettext(
146
 
                    'Unable to connect to current master branch %(target)s: '
147
 
                    '%(error)s To switch anyway, use --force.') %
148
 
                    e.__dict__)
149
 
            with b.lock_write():
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())
 
87
                        'throw them away.')
 
88
            except errors.BoundBranchConnectionFailure, e:
 
89
                raise errors.BzrCommandError(
 
90
                        'Unable to connect to current master branch %(target)s: '
 
91
                        '%(error)s To switch anyway, use --force.' %
 
92
                        e.__dict__)
 
93
            b.set_bound_location(None)
 
94
            b.pull(to_branch, overwrite=True,
 
95
                possible_transports=possible_transports)
 
96
            b.set_bound_location(to_branch.base)
155
97
        else:
156
 
            # If this is a standalone tree and the new branch
157
 
            # is derived from this one, create a lightweight checkout.
158
 
            with b.lock_read():
159
 
                graph = b.repository.get_graph(to_branch.repository)
160
 
                if (b.controldir._format.colocated_branches and
161
 
                    (force or graph.is_ancestor(
162
 
                        b.last_revision(), to_branch.last_revision()))):
163
 
                    b.controldir.destroy_branch()
164
 
                    b.controldir.set_branch_reference(to_branch, name="")
165
 
                else:
166
 
                    raise errors.CommandError(
167
 
                        gettext('Cannot switch a branch, only a checkout.'))
 
98
            raise errors.BzrCommandError('Cannot switch a branch, '
 
99
                'only a checkout.')
168
100
 
169
101
 
170
102
def _any_local_commits(this_branch, possible_transports):
172
104
    last_rev = revision.ensure_null(this_branch.last_revision())
173
105
    if last_rev != revision.NULL_REVISION:
174
106
        other_branch = this_branch.get_master_branch(possible_transports)
175
 
        with this_branch.lock_read(), other_branch.lock_read():
 
107
        this_branch.lock_read()
 
108
        other_branch.lock_read()
 
109
        try:
176
110
            other_last_rev = other_branch.last_revision()
177
111
            graph = this_branch.repository.get_graph(
178
112
                other_branch.repository)
179
113
            if not graph.is_ancestor(last_rev, other_last_rev):
180
114
                return True
 
115
        finally:
 
116
            other_branch.unlock()
 
117
            this_branch.unlock()
181
118
    return False
 
119
 
 
120
 
 
121
def _update(tree, source_repository, quiet=False):
 
122
    """Update a working tree to the latest revision of its branch.
 
123
 
 
124
    :param tree: the working tree
 
125
    :param source_repository: repository holding the revisions
 
126
    """
 
127
    tree.lock_tree_write()
 
128
    try:
 
129
        to_branch = tree.branch
 
130
        if tree.last_revision() == to_branch.last_revision():
 
131
            if not quiet:
 
132
                note("Tree is up to date at revision %d.", to_branch.revno())
 
133
            return
 
134
        base_tree = source_repository.revision_tree(tree.last_revision())
 
135
        merge.Merge3Merger(tree, tree, base_tree, to_branch.basis_tree())
 
136
        tree.set_last_revision(to_branch.last_revision())
 
137
        if not quiet:
 
138
            note('Updated to revision %d.' % to_branch.revno())
 
139
    finally:
 
140
        tree.unlock()