6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
1 |
# Copyright (C) 2007, 2009-2012 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 |
|
6379.6.3
by Jelmer Vernooij
Use absolute_import. |
17 |
from __future__ import absolute_import |
18 |
||
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
19 |
# Original author: David Allouche
|
20 |
||
6538.1.20
by Aaron Bentley
Cleanup |
21 |
from bzrlib import ( |
22 |
errors, |
|
23 |
lock, |
|
24 |
merge, |
|
25 |
revision
|
|
26 |
)
|
|
5162.3.4
by Aaron Bentley
Restore now-needed branch import. |
27 |
from bzrlib.branch import Branch |
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
28 |
from bzrlib.i18n import gettext |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
29 |
from bzrlib.trace import note |
30 |
||
5107.3.1
by Marco Pantaleoni
Added the new hooks 'post_branch', 'post_switch' and 'post_repo_init', |
31 |
def _run_post_switch_hooks(control_dir, to_branch, force, revision_id): |
32 |
from bzrlib.branch import SwitchHookParams |
|
33 |
hooks = Branch.hooks['post_switch'] |
|
34 |
if not hooks: |
|
35 |
return
|
|
36 |
params = SwitchHookParams(control_dir, to_branch, force, revision_id) |
|
37 |
for hook in hooks: |
|
38 |
hook(params) |
|
39 |
||
6538.1.15
by Aaron Bentley
Switch.switch stores and restores changes. |
40 |
def switch(control_dir, to_branch, force=False, quiet=False, revision_id=None, |
41 |
store_uncommitted=False): |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
42 |
"""Switch the branch associated with a checkout.
|
43 |
||
6207.3.3
by jelmer at samba
Fix tests and the like. |
44 |
:param control_dir: ControlDir of the checkout to change
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
45 |
:param to_branch: branch that the checkout is to reference
|
3078.2.2
by Ian Clatworthy
get switch tests passing on heavyweight checkouts |
46 |
:param force: skip the check for local commits in a heavy checkout
|
3984.5.19
by Andrew Bennetts
Merge lp:bzr, resolving conflicts. |
47 |
:param revision_id: revision ID to switch to.
|
6538.1.20
by Aaron Bentley
Cleanup |
48 |
:param store_uncommitted: If True, store uncommitted changes in the
|
49 |
branch.
|
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
50 |
"""
|
3078.2.5
by Ian Clatworthy
make switch fail without --force if branch missing |
51 |
_check_pending_merges(control_dir, force) |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
52 |
try: |
53 |
source_repository = control_dir.open_branch().repository |
|
54 |
except errors.NotBranchError: |
|
55 |
source_repository = to_branch.repository |
|
6538.1.15
by Aaron Bentley
Switch.switch stores and restores changes. |
56 |
if store_uncommitted: |
6538.1.20
by Aaron Bentley
Cleanup |
57 |
with lock.write_locked(control_dir.open_workingtree()) as tree: |
58 |
tree.store_uncommitted() |
|
6437.21.7
by Jelmer Vernooij
Fix remaining tests. |
59 |
to_branch.lock_read() |
60 |
try: |
|
61 |
_set_branch_location(control_dir, to_branch, force) |
|
62 |
finally: |
|
63 |
to_branch.unlock() |
|
6538.1.28
by Aaron Bentley
Avoid branch write lock to preserve VFS call count. |
64 |
tree = control_dir.open_workingtree() |
65 |
_update(tree, source_repository, quiet, revision_id, store_uncommitted) |
|
5107.3.4
by Marco Pantaleoni
Applied suggestions from merge reviewer (John A Meinel): |
66 |
_run_post_switch_hooks(control_dir, to_branch, force, revision_id) |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
67 |
|
3078.2.5
by Ian Clatworthy
make switch fail without --force if branch missing |
68 |
def _check_pending_merges(control, force=False): |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
69 |
"""Check that there are no outstanding pending merges before switching.
|
70 |
||
6207.3.3
by jelmer at samba
Fix tests and the like. |
71 |
:param control: ControlDir of the branch to check
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
72 |
"""
|
73 |
try: |
|
74 |
tree = control.open_workingtree() |
|
3078.2.5
by Ian Clatworthy
make switch fail without --force if branch missing |
75 |
except errors.NotBranchError, ex: |
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
76 |
# Lightweight checkout and branch is no longer there
|
3078.2.5
by Ian Clatworthy
make switch fail without --force if branch missing |
77 |
if force: |
78 |
return
|
|
79 |
else: |
|
80 |
raise ex |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
81 |
# XXX: Should the tree be locked for get_parent_ids?
|
82 |
existing_pending_merges = tree.get_parent_ids()[1:] |
|
83 |
if len(existing_pending_merges) > 0: |
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
84 |
raise errors.BzrCommandError(gettext('Pending merges must be ' |
85 |
'committed or reverted before using switch.')) |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
86 |
|
87 |
||
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
88 |
def _set_branch_location(control, to_branch, force=False): |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
89 |
"""Set location value of a branch reference.
|
90 |
||
6207.3.3
by jelmer at samba
Fix tests and the like. |
91 |
:param control: ControlDir of the checkout to change
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
92 |
:param to_branch: branch that the checkout is to reference
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
93 |
: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 |
94 |
"""
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
95 |
branch_format = control.find_branch_format() |
96 |
if branch_format.get_reference(control) is not None: |
|
97 |
# Lightweight checkout: update the branch reference
|
|
5147.4.4
by Jelmer Vernooij
Support colocated branches in BranchReference. |
98 |
branch_format.set_reference(control, None, to_branch) |
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
99 |
else: |
100 |
b = control.open_branch() |
|
101 |
bound_branch = b.get_bound_location() |
|
102 |
if bound_branch is not None: |
|
103 |
# Heavyweight checkout: check all local commits
|
|
104 |
# have been pushed to the current bound branch then
|
|
105 |
# synchronise the local branch with the new remote branch
|
|
106 |
# and bind to it
|
|
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
107 |
possible_transports = [] |
4340.1.1
by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch. |
108 |
try: |
109 |
if not force and _any_local_commits(b, possible_transports): |
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
110 |
raise errors.BzrCommandError(gettext( |
4340.1.1
by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch. |
111 |
'Cannot switch as local commits found in the checkout. '
|
112 |
'Commit these to the bound branch or use --force to '
|
|
6138.3.8
by Jonathan Riddell
more error gettext()ing |
113 |
'throw them away.')) |
4340.1.1
by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch. |
114 |
except errors.BoundBranchConnectionFailure, e: |
6138.3.8
by Jonathan Riddell
more error gettext()ing |
115 |
raise errors.BzrCommandError(gettext( |
4340.1.1
by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch. |
116 |
'Unable to connect to current master branch %(target)s: ' |
6138.3.8
by Jonathan Riddell
more error gettext()ing |
117 |
'%(error)s To switch anyway, use --force.') % |
4340.1.1
by Jelmer Vernooij
Mention --force when bzr switch fails to open the current master branch. |
118 |
e.__dict__) |
6404.6.1
by Vincent Ladeuil
Tests passing for a first rough version of a cached branch config store. The changes here are too invasive and several parallel proposals have been made. |
119 |
b.lock_write() |
120 |
try: |
|
121 |
b.set_bound_location(None) |
|
122 |
b.pull(to_branch, overwrite=True, |
|
123 |
possible_transports=possible_transports) |
|
124 |
b.set_bound_location(to_branch.base) |
|
125 |
b.set_parent(b.get_master_branch().get_parent()) |
|
126 |
finally: |
|
127 |
b.unlock() |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
128 |
else: |
6437.7.5
by Jelmer Vernooij
"bzr switch -b" in a standalone tree will now create a colocated branch. |
129 |
# If this is a standalone tree and the new branch
|
130 |
# is derived from this one, create a lightweight checkout.
|
|
6437.21.7
by Jelmer Vernooij
Fix remaining tests. |
131 |
b.lock_read() |
132 |
try: |
|
133 |
graph = b.repository.get_graph(to_branch.repository) |
|
134 |
if (b.bzrdir._format.colocated_branches and |
|
135 |
(force or graph.is_ancestor(b.last_revision(), |
|
136 |
to_branch.last_revision()))): |
|
137 |
b.bzrdir.destroy_branch() |
|
138 |
b.bzrdir.set_branch_reference(to_branch, name="") |
|
139 |
else: |
|
140 |
raise errors.BzrCommandError(gettext('Cannot switch a branch, ' |
|
141 |
'only a checkout.')) |
|
142 |
finally: |
|
143 |
b.unlock() |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
144 |
|
145 |
||
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
146 |
def _any_local_commits(this_branch, possible_transports): |
147 |
"""Does this branch have any commits not in the master branch?"""
|
|
3078.2.2
by Ian Clatworthy
get switch tests passing on heavyweight checkouts |
148 |
last_rev = revision.ensure_null(this_branch.last_revision()) |
149 |
if last_rev != revision.NULL_REVISION: |
|
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
150 |
other_branch = this_branch.get_master_branch(possible_transports) |
151 |
this_branch.lock_read() |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
152 |
other_branch.lock_read() |
153 |
try: |
|
154 |
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 |
155 |
graph = this_branch.repository.get_graph( |
156 |
other_branch.repository) |
|
157 |
if not graph.is_ancestor(last_rev, other_last_rev): |
|
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
158 |
return True |
159 |
finally: |
|
160 |
other_branch.unlock() |
|
3078.2.6
by Ian Clatworthy
fix efficiency of local commit detection as recommended by jameinel's review |
161 |
this_branch.unlock() |
3078.2.1
by Ian Clatworthy
Refactor switch to support heavyweight checkouts |
162 |
return False |
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
163 |
|
164 |
||
6538.1.15
by Aaron Bentley
Switch.switch stores and restores changes. |
165 |
def _update(tree, source_repository, quiet=False, revision_id=None, |
166 |
restore_uncommitted=False): |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
167 |
"""Update a working tree to the latest revision of its branch.
|
168 |
||
169 |
:param tree: the working tree
|
|
170 |
:param source_repository: repository holding the revisions
|
|
6538.1.20
by Aaron Bentley
Cleanup |
171 |
:param restore_uncommitted: restore any uncommitted changes in the branch.
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
172 |
"""
|
6538.1.28
by Aaron Bentley
Avoid branch write lock to preserve VFS call count. |
173 |
if restore_uncommitted: |
174 |
tree.lock_write() |
|
175 |
else: |
|
176 |
tree.lock_tree_write() |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
177 |
try: |
178 |
to_branch = tree.branch |
|
3984.5.4
by Daniel Watkins
Implement use of a revision at the bzrlib.switch level. |
179 |
if revision_id is None: |
180 |
revision_id = to_branch.last_revision() |
|
181 |
if tree.last_revision() == revision_id: |
|
4459.4.1
by Aaron Bentley
Provide control over switch and shelver messaging. |
182 |
if not quiet: |
6138.3.4
by Jonathan Riddell
add gettext() to uses of trace.note() |
183 |
note(gettext("Tree is up to date at revision %d."), to_branch.revno()) |
6538.1.16
by Aaron Bentley
Restore uncommitted changes even if revisions are same. |
184 |
else: |
185 |
base_tree = source_repository.revision_tree(tree.last_revision()) |
|
186 |
merge.Merge3Merger(tree, tree, base_tree, |
|
187 |
to_branch.repository.revision_tree(revision_id)) |
|
188 |
tree.set_last_revision(to_branch.last_revision()) |
|
189 |
if not quiet: |
|
190 |
note(gettext('Updated to revision %d.') % to_branch.revno()) |
|
6538.1.15
by Aaron Bentley
Switch.switch stores and restores changes. |
191 |
if restore_uncommitted: |
192 |
tree.restore_uncommitted() |
|
2999.1.5
by Ian Clatworthy
make switch.py unix file format, not dos |
193 |
finally: |
194 |
tree.unlock() |