/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: Jelmer Vernooij
  • Date: 2018-05-06 11:48:54 UTC
  • mto: This revision was merged to the branch mainline in revision 6960.
  • Revision ID: jelmer@jelmer.uk-20180506114854-h4qd9ojaqy8wxjsd
Move .mailmap to root.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/switch.py
28
28
from .i18n import gettext
29
29
from .trace import note
30
30
 
31
 
 
32
31
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id):
33
32
    from .branch import SwitchHookParams
34
33
    hooks = Branch.hooks['post_switch']
38
37
    for hook in hooks:
39
38
        hook(params)
40
39
 
41
 
 
42
40
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None,
43
 
           store_uncommitted=False, possible_transports=None):
 
41
           store_uncommitted=False):
44
42
    """Switch the branch associated with a checkout.
45
43
 
46
44
    :param control_dir: ControlDir of the checkout to change
50
48
    :param store_uncommitted: If True, store uncommitted changes in the
51
49
        branch.
52
50
    """
53
 
    try:
54
 
        tree = control_dir.open_workingtree()
 
51
    _check_pending_merges(control_dir, force)
 
52
    try:
 
53
        source_repository = control_dir.open_branch().repository
 
54
    except errors.NotBranchError:
 
55
        source_repository = to_branch.repository
 
56
    if store_uncommitted:
 
57
        with lock.write_locked(control_dir.open_workingtree()) as tree:
 
58
            tree.store_uncommitted()
 
59
    with to_branch.lock_read():
 
60
        _set_branch_location(control_dir, to_branch, force)
 
61
    tree = control_dir.open_workingtree()
 
62
    _update(tree, source_repository, quiet, revision_id, store_uncommitted)
 
63
    _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
 
64
 
 
65
def _check_pending_merges(control, force=False):
 
66
    """Check that there are no outstanding pending merges before switching.
 
67
 
 
68
    :param control: ControlDir of the branch to check
 
69
    """
 
70
    try:
 
71
        tree = control.open_workingtree()
55
72
    except errors.NotBranchError as ex:
56
73
        # Lightweight checkout and branch is no longer there
57
 
        if not force or store_uncommitted:
 
74
        if force:
 
75
            return
 
76
        else:
58
77
            raise ex
59
 
        else:
60
 
            tree = None
61
 
    else:
62
 
        if store_uncommitted or tree.branch.get_bound_location():
63
 
            tree.lock_write()
64
 
        else:
65
 
            tree.lock_tree_write()
66
 
    try:
67
 
        if tree is not None:
68
 
            parent_ids = tree.get_parent_ids()
69
 
            if len(parent_ids) > 1:
70
 
                raise errors.BzrCommandError(
71
 
                    gettext('Pending merges must be '
72
 
                            'committed or reverted before using switch.'))
73
 
 
74
 
        if store_uncommitted:
75
 
            tree.store_uncommitted()
76
 
        if tree is None:
77
 
            source_repository = to_branch.repository
78
 
            base_revision_id = None
79
 
        else:
80
 
            source_repository = tree.branch.repository
81
 
            # Attempt to retrieve the base_revision_id now, since some
82
 
            # working tree formats (i.e. git) don't have their own
83
 
            # last_revision but just use that of the currently active branch.
84
 
            base_revision_id = tree.last_revision()
85
 
    finally:
86
 
        if tree is not None:
87
 
            tree.unlock()
88
 
    with to_branch.lock_read():
89
 
        _set_branch_location(control_dir, to_branch, tree.branch if tree else None, force)
90
 
    tree = control_dir.open_workingtree()
91
 
    if store_uncommitted:
92
 
        tree.lock_write()
93
 
    else:
94
 
        tree.lock_tree_write()
95
 
    try:
96
 
        if base_revision_id is None:
97
 
            # If we couldn't get to the tree's last_revision earlier, perhaps
98
 
            # we can now.
99
 
            base_revision_id = tree.last_revision()
100
 
        if revision_id is None:
101
 
            revision_id = to_branch.last_revision()
102
 
        if base_revision_id == revision_id:
103
 
            if not quiet:
104
 
                note(gettext("Tree is up to date at revision %d."),
105
 
                     to_branch.revno())
106
 
        else:
107
 
            base_tree = source_repository.revision_tree(base_revision_id)
108
 
            target_tree = to_branch.repository.revision_tree(revision_id)
109
 
            merge.Merge3Merger(tree, tree, base_tree, target_tree)
110
 
            tree.set_last_revision(revision_id)
111
 
            if not quiet:
112
 
                note(gettext('Updated to revision %d.') % to_branch.revno())
113
 
        if store_uncommitted:
114
 
            tree.restore_uncommitted()
115
 
        _run_post_switch_hooks(control_dir, to_branch, force, revision_id)
116
 
    finally:
117
 
        tree.unlock()
118
 
 
119
 
 
120
 
def _set_branch_location(control, to_branch, current_branch, force=False):
 
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:
 
81
        raise errors.BzrCommandError(gettext('Pending merges must be '
 
82
            'committed or reverted before using switch.'))
 
83
 
 
84
 
 
85
def _set_branch_location(control, to_branch, force=False):
121
86
    """Set location value of a branch reference.
122
87
 
123
88
    :param control: ControlDir of the checkout to change
129
94
        # Lightweight checkout: update the branch reference
130
95
        branch_format.set_reference(control, None, to_branch)
131
96
    else:
132
 
        b = current_branch
 
97
        b = control.open_branch()
133
98
        bound_branch = b.get_bound_location()
134
99
        if bound_branch is not None:
135
100
            # Heavyweight checkout: check all local commits
145
110
                        'throw them away.'))
146
111
            except errors.BoundBranchConnectionFailure as e:
147
112
                raise errors.BzrCommandError(gettext(
148
 
                    'Unable to connect to current master branch %(target)s: '
149
 
                    '%(error)s To switch anyway, use --force.') %
150
 
                    e.__dict__)
151
 
            with b.lock_write():
 
113
                        'Unable to connect to current master branch %(target)s: '
 
114
                        '%(error)s To switch anyway, use --force.') %
 
115
                        e.__dict__)
 
116
            b.lock_write()
 
117
            try:
152
118
                b.set_bound_location(None)
153
119
                b.pull(to_branch, overwrite=True,
154
120
                       possible_transports=possible_transports)
155
121
                b.set_bound_location(to_branch.base)
156
122
                b.set_parent(b.get_master_branch().get_parent())
 
123
            finally:
 
124
                b.unlock()
157
125
        else:
158
126
            # If this is a standalone tree and the new branch
159
127
            # is derived from this one, create a lightweight checkout.
160
128
            with b.lock_read():
161
129
                graph = b.repository.get_graph(to_branch.repository)
162
130
                if (b.controldir._format.colocated_branches and
163
 
                    (force or graph.is_ancestor(
164
 
                        b.last_revision(), to_branch.last_revision()))):
 
131
                     (force or graph.is_ancestor(b.last_revision(),
 
132
                        to_branch.last_revision()))):
165
133
                    b.controldir.destroy_branch()
166
134
                    b.controldir.set_branch_reference(to_branch, name="")
167
135
                else:
168
 
                    raise errors.BzrCommandError(
169
 
                        gettext('Cannot switch a branch, only a checkout.'))
 
136
                    raise errors.BzrCommandError(gettext('Cannot switch a branch, '
 
137
                        'only a checkout.'))
170
138
 
171
139
 
172
140
def _any_local_commits(this_branch, possible_transports):
181
149
            if not graph.is_ancestor(last_rev, other_last_rev):
182
150
                return True
183
151
    return False
 
152
 
 
153
 
 
154
def _update(tree, source_repository, quiet=False, revision_id=None,
 
155
            restore_uncommitted=False):
 
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
 
160
    :param restore_uncommitted: restore any uncommitted changes in the branch.
 
161
    """
 
162
    if restore_uncommitted:
 
163
        tree.lock_write()
 
164
    else:
 
165
        tree.lock_tree_write()
 
166
    try:
 
167
        to_branch = tree.branch
 
168
        if revision_id is None:
 
169
            revision_id = to_branch.last_revision()
 
170
        if tree.last_revision() == revision_id:
 
171
            if not quiet:
 
172
                note(gettext("Tree is up to date at revision %d."), to_branch.revno())
 
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())
 
180
        if restore_uncommitted:
 
181
            tree.restore_uncommitted()
 
182
    finally:
 
183
        tree.unlock()