2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
1 |
# Copyright (C) 2006 Canonical Ltd
|
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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
17 |
"""Server-side branch related request implmentations."""
|
|
18 |
||
19 |
||
20 |
from bzrlib import errors |
|
21 |
from bzrlib.bzrdir import BzrDir |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
22 |
from bzrlib.smart.request import ( |
23 |
FailedSmartServerResponse, |
|
24 |
SmartServerRequest, |
|
25 |
SuccessfulSmartServerResponse, |
|
26 |
)
|
|
2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
27 |
|
28 |
||
2018.5.49
by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to |
29 |
class SmartServerBranchRequest(SmartServerRequest): |
2692.1.10
by Andrew Bennetts
More docstring polish |
30 |
"""Base class for handling common branch request logic.
|
31 |
"""
|
|
2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
32 |
|
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
33 |
def do(self, path, *args): |
2018.5.49
by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to |
34 |
"""Execute a request for a branch at path.
|
2692.1.10
by Andrew Bennetts
More docstring polish |
35 |
|
36 |
All Branch requests take a path to the branch as their first argument.
|
|
2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
37 |
|
38 |
If the branch is a branch reference, NotBranchError is raised.
|
|
2692.1.10
by Andrew Bennetts
More docstring polish |
39 |
|
40 |
:param path: The path for the repository as received from the
|
|
41 |
client.
|
|
42 |
:return: A SmartServerResponse from self.do_with_branch().
|
|
2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
43 |
"""
|
2692.1.1
by Andrew Bennetts
Add translate_client_path method to SmartServerRequest. |
44 |
transport = self.transport_from_client_path(path) |
2018.5.38
by Robert Collins
Implement RemoteBranch.revision_history(). |
45 |
bzrdir = BzrDir.open_from_transport(transport) |
46 |
if bzrdir.get_branch_reference() is not None: |
|
47 |
raise errors.NotBranchError(transport.base) |
|
48 |
branch = bzrdir.open_branch() |
|
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
49 |
return self.do_with_branch(branch, *args) |
2018.5.49
by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to |
50 |
|
51 |
||
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
52 |
class SmartServerLockedBranchRequest(SmartServerBranchRequest): |
53 |
"""Base class for handling common branch request logic for requests that
|
|
54 |
need a write lock.
|
|
55 |
"""
|
|
56 |
||
57 |
def do_with_branch(self, branch, branch_token, repo_token, *args): |
|
58 |
"""Execute a request for a branch.
|
|
59 |
||
60 |
A write lock will be acquired with the given tokens for the branch and
|
|
61 |
repository locks. The lock will be released once the request is
|
|
62 |
processed. The physical lock state won't be changed.
|
|
63 |
"""
|
|
64 |
# XXX: write a test for LockContention
|
|
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
65 |
branch.repository.lock_write(token=repo_token) |
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
66 |
try: |
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
67 |
branch.lock_write(token=branch_token) |
68 |
try: |
|
69 |
return self.do_with_locked_branch(branch, *args) |
|
70 |
finally: |
|
71 |
branch.unlock() |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
72 |
finally: |
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
73 |
branch.repository.unlock() |
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
74 |
|
75 |
||
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
76 |
class SmartServerBranchGetConfigFile(SmartServerBranchRequest): |
77 |
||
78 |
def do_with_branch(self, branch): |
|
3407.2.1
by Martin Pool
Deprecate LockableFiles.get |
79 |
"""Return the content of branch.conf
|
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
80 |
|
81 |
The body is not utf8 decoded - its the literal bytestream from disk.
|
|
82 |
"""
|
|
3407.2.2
by Martin Pool
Remove special case in RemoteBranchLockableFiles for branch.conf |
83 |
# This was at one time called by RemoteBranchLockableFiles
|
84 |
# intercepting access to this file; as of 1.5 it is not called by the
|
|
85 |
# client but retained for compatibility. It may be called again to
|
|
86 |
# allow the client to get the configuration without needing vfs
|
|
87 |
# access.
|
|
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
88 |
try: |
3407.2.14
by Martin Pool
Remove more cases of getting transport via control_files |
89 |
content = branch._transport.get_bytes('branch.conf') |
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
90 |
except errors.NoSuchFile: |
91 |
content = '' |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
92 |
return SuccessfulSmartServerResponse( ('ok', ), content) |
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
93 |
|
94 |
||
3691.2.5
by Martin Pool
Add Branch.get_stacked_on_url rpc and tests for same |
95 |
class SmartServerBranchRequestGetStackedOnURL(SmartServerBranchRequest): |
96 |
||
97 |
def do_with_branch(self, branch): |
|
98 |
stacked_on_url = branch.get_stacked_on_url() |
|
99 |
return SuccessfulSmartServerResponse(('ok', stacked_on_url)) |
|
100 |
||
101 |
||
2018.5.49
by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to |
102 |
class SmartServerRequestRevisionHistory(SmartServerBranchRequest): |
103 |
||
104 |
def do_with_branch(self, branch): |
|
105 |
"""Get the revision history for the branch.
|
|
106 |
||
107 |
The revision list is returned as the body content,
|
|
108 |
with each revision utf8 encoded and \x00 joined.
|
|
109 |
"""
|
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
110 |
return SuccessfulSmartServerResponse( |
2018.5.83
by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs. |
111 |
('ok', ), ('\x00'.join(branch.revision_history()))) |
2018.5.50
by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method. |
112 |
|
113 |
||
114 |
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest): |
|
115 |
||
116 |
def do_with_branch(self, branch): |
|
117 |
"""Return branch.last_revision_info().
|
|
118 |
|
|
119 |
The revno is encoded in decimal, the revision_id is encoded as utf8.
|
|
120 |
"""
|
|
121 |
revno, last_revision = branch.last_revision_info() |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
122 |
return SuccessfulSmartServerResponse(('ok', str(revno), last_revision)) |
2018.5.50
by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method. |
123 |
|
124 |
||
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
125 |
class SmartServerSetTipRequest(SmartServerLockedBranchRequest): |
126 |
"""Base class for handling common branch request logic for requests that
|
|
127 |
update the branch tip.
|
|
128 |
"""
|
|
129 |
||
130 |
def do_with_locked_branch(self, branch, *args): |
|
131 |
try: |
|
132 |
return self.do_tip_change_with_locked_branch(branch, *args) |
|
133 |
except errors.TipChangeRejected, e: |
|
134 |
msg = e.msg |
|
135 |
if isinstance(msg, unicode): |
|
136 |
msg = msg.encode('utf-8') |
|
137 |
return FailedSmartServerResponse(('TipChangeRejected', msg)) |
|
138 |
||
139 |
||
140 |
class SmartServerBranchRequestSetLastRevision(SmartServerSetTipRequest): |
|
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
141 |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
142 |
def do_tip_change_with_locked_branch(self, branch, new_last_revision_id): |
2018.5.170
by Andrew Bennetts
Use 'null:' instead of '' to mean NULL_REVISION on the wire. |
143 |
if new_last_revision_id == 'null:': |
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
144 |
branch.set_revision_history([]) |
145 |
else: |
|
2018.5.83
by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs. |
146 |
if not branch.repository.has_revision(new_last_revision_id): |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
147 |
return FailedSmartServerResponse( |
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
148 |
('NoSuchRevision', new_last_revision_id)) |
2018.5.83
by Andrew Bennetts
Fix some test failures caused by the switch from unicode to UTF-8-encoded strs for revision IDs. |
149 |
branch.generate_revision_history(new_last_revision_id) |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
150 |
return SuccessfulSmartServerResponse(('ok',)) |
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
151 |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
152 |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
153 |
class SmartServerBranchRequestSetLastRevisionEx(SmartServerSetTipRequest): |
3441.5.6
by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests. |
154 |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
155 |
def do_tip_change_with_locked_branch(self, branch, new_last_revision_id, |
3441.5.28
by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant. |
156 |
allow_divergence, allow_overwrite_descendant): |
3441.5.25
by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading. |
157 |
"""Set the last revision of the branch.
|
158 |
||
159 |
New in 1.6.
|
|
160 |
|
|
161 |
:param new_last_revision_id: the revision ID to set as the last
|
|
162 |
revision of the branch.
|
|
163 |
:param allow_divergence: A flag. If non-zero, change the revision ID
|
|
164 |
even if the new_last_revision_id's ancestry has diverged from the
|
|
165 |
current last revision. If zero, a 'Diverged' error will be
|
|
166 |
returned if new_last_revision_id is not a descendant of the current
|
|
167 |
last revision.
|
|
3441.5.28
by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant. |
168 |
:param allow_overwrite_descendant: A flag. If zero and
|
3441.5.25
by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading. |
169 |
new_last_revision_id is not a descendant of the current last
|
3441.5.28
by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant. |
170 |
revision, then the last revision will not be changed. If non-zero
|
171 |
and there is no divergence, then the last revision is always
|
|
172 |
changed.
|
|
3441.5.25
by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading. |
173 |
|
174 |
:returns: on success, a tuple of ('ok', revno, revision_id), where
|
|
175 |
revno and revision_id are the new values of the current last
|
|
176 |
revision info. The revision_id might be different to the
|
|
3441.5.28
by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant. |
177 |
new_last_revision_id if allow_overwrite_descendant was not set.
|
3441.5.25
by Andrew Bennetts
Rename Branch.set_last_revision_descendant verb to Branch.set_last_revision_ex. It's a cop out, but at least it's not misleading. |
178 |
"""
|
3441.5.28
by Andrew Bennetts
Another review tweak: rename do_not_overwrite_descendant to allow_overwrite_descendant. |
179 |
do_not_overwrite_descendant = not allow_overwrite_descendant |
3441.5.6
by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests. |
180 |
try: |
3441.5.18
by Andrew Bennetts
Fix some test failures. |
181 |
last_revno, last_rev = branch.last_revision_info() |
182 |
graph = branch.repository.get_graph() |
|
183 |
if not allow_divergence or do_not_overwrite_descendant: |
|
184 |
relation = branch._revision_relations( |
|
185 |
last_rev, new_last_revision_id, graph) |
|
186 |
if relation == 'diverged' and not allow_divergence: |
|
187 |
return FailedSmartServerResponse(('Diverged',)) |
|
188 |
if relation == 'a_descends_from_b' and do_not_overwrite_descendant: |
|
189 |
return SuccessfulSmartServerResponse( |
|
190 |
('ok', last_revno, last_rev)) |
|
191 |
new_revno = graph.find_distance_to_null( |
|
192 |
new_last_revision_id, [(last_rev, last_revno)]) |
|
193 |
branch.set_last_revision_info(new_revno, new_last_revision_id) |
|
3441.5.23
by Andrew Bennetts
Fix test failures. |
194 |
except errors.GhostRevisionsHaveNoRevno: |
3441.5.6
by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests. |
195 |
return FailedSmartServerResponse( |
196 |
('NoSuchRevision', new_last_revision_id)) |
|
3441.5.18
by Andrew Bennetts
Fix some test failures. |
197 |
return SuccessfulSmartServerResponse( |
198 |
('ok', new_revno, new_last_revision_id)) |
|
3441.5.6
by Andrew Bennetts
Greatly simplify RemoteBranch.update_revisions. Still needs more tests. |
199 |
|
200 |
||
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
201 |
class SmartServerBranchRequestSetLastRevisionInfo(SmartServerSetTipRequest): |
3297.4.2
by Andrew Bennetts
Add backwards compatibility for servers older than 1.4. |
202 |
"""Branch.set_last_revision_info. Sets the revno and the revision ID of
|
203 |
the specified branch.
|
|
204 |
||
205 |
New in bzrlib 1.4.
|
|
206 |
"""
|
|
2892.2.1
by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it. |
207 |
|
3577.1.1
by Andrew Bennetts
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom. |
208 |
def do_tip_change_with_locked_branch(self, branch, new_revno, |
209 |
new_last_revision_id): |
|
3297.4.3
by Andrew Bennetts
Add more tests, handle NoSuchRevision in case the remote branch's format can raise it. |
210 |
try: |
211 |
branch.set_last_revision_info(int(new_revno), new_last_revision_id) |
|
212 |
except errors.NoSuchRevision: |
|
213 |
return FailedSmartServerResponse( |
|
214 |
('NoSuchRevision', new_last_revision_id)) |
|
2892.2.1
by Andrew Bennetts
Add Branch.set_last_revision_info smart method, and make the RemoteBranch client use it. |
215 |
return SuccessfulSmartServerResponse(('ok',)) |
216 |
||
217 |
||
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
218 |
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest): |
219 |
||
220 |
def do_with_branch(self, branch, branch_token='', repo_token=''): |
|
221 |
if branch_token == '': |
|
222 |
branch_token = None |
|
223 |
if repo_token == '': |
|
224 |
repo_token = None |
|
225 |
try: |
|
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
226 |
repo_token = branch.repository.lock_write(token=repo_token) |
227 |
try: |
|
228 |
branch_token = branch.lock_write(token=branch_token) |
|
229 |
finally: |
|
3015.2.6
by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories. |
230 |
# this leaves the repository with 1 lock
|
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
231 |
branch.repository.unlock() |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
232 |
except errors.LockContention: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
233 |
return FailedSmartServerResponse(('LockContention',)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
234 |
except errors.TokenMismatch: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
235 |
return FailedSmartServerResponse(('TokenMismatch',)) |
2018.5.95
by Andrew Bennetts
Add a Transport.is_readonly remote call, let {Branch,Repository}.lock_write remote call return UnlockableTransport, and miscellaneous test fixes. |
236 |
except errors.UnlockableTransport: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
237 |
return FailedSmartServerResponse(('UnlockableTransport',)) |
2872.5.3
by Martin Pool
Pass back LockFailed from smart server lock methods |
238 |
except errors.LockFailed, e: |
239 |
return FailedSmartServerResponse(('LockFailed', str(e.lock), str(e.why))) |
|
3015.2.6
by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories. |
240 |
if repo_token is None: |
241 |
repo_token = '' |
|
242 |
else: |
|
243 |
branch.repository.leave_lock_in_place() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
244 |
branch.leave_lock_in_place() |
245 |
branch.unlock() |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
246 |
return SuccessfulSmartServerResponse(('ok', branch_token, repo_token)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
247 |
|
248 |
||
249 |
class SmartServerBranchRequestUnlock(SmartServerBranchRequest): |
|
250 |
||
251 |
def do_with_branch(self, branch, branch_token, repo_token): |
|
252 |
try: |
|
2018.5.142
by Andrew Bennetts
Change Branch.lock_token to only accept and receive the branch lock token (rather than the branch and repo lock tokens). |
253 |
branch.repository.lock_write(token=repo_token) |
254 |
try: |
|
255 |
branch.lock_write(token=branch_token) |
|
256 |
finally: |
|
257 |
branch.repository.unlock() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
258 |
except errors.TokenMismatch: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
259 |
return FailedSmartServerResponse(('TokenMismatch',)) |
3015.2.6
by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories. |
260 |
if repo_token: |
261 |
branch.repository.dont_leave_lock_in_place() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
262 |
branch.dont_leave_lock_in_place() |
263 |
branch.unlock() |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
264 |
return SuccessfulSmartServerResponse(('ok',)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
265 |