/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 breezy/switch.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-08-23 01:15:41 UTC
  • mfrom: (7520.1.4 merge-3.1)
  • Revision ID: breezy.the.bot@gmail.com-20200823011541-nv0oh7nzaganx2qy
Merge lp:brz/3.1.

Merged from https://code.launchpad.net/~jelmer/brz/merge-3.1/+merge/389690

Show diffs side-by-side

added added

removed removed

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