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): |
|
79 |
"""Return the content of branch.control_files.get('branch.conf').
|
|
80 |
|
|
81 |
The body is not utf8 decoded - its the literal bytestream from disk.
|
|
82 |
"""
|
|
83 |
try: |
|
84 |
content = branch.control_files.get('branch.conf').read() |
|
85 |
except errors.NoSuchFile: |
|
86 |
content = '' |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
87 |
return SuccessfulSmartServerResponse( ('ok', ), content) |
2018.5.59
by Robert Collins
Get BranchConfig working somewhat on RemoteBranches (Robert Collins, Vincent Ladeuil). |
88 |
|
89 |
||
2018.5.49
by Wouter van Heyst
Refactor SmartServerBranchRequest out from SmartServerRequestRevisionHistory to |
90 |
class SmartServerRequestRevisionHistory(SmartServerBranchRequest): |
91 |
||
92 |
def do_with_branch(self, branch): |
|
93 |
"""Get the revision history for the branch.
|
|
94 |
||
95 |
The revision list is returned as the body content,
|
|
96 |
with each revision utf8 encoded and \x00 joined.
|
|
97 |
"""
|
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
98 |
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. |
99 |
('ok', ), ('\x00'.join(branch.revision_history()))) |
2018.5.50
by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method. |
100 |
|
101 |
||
102 |
class SmartServerBranchRequestLastRevisionInfo(SmartServerBranchRequest): |
|
103 |
||
104 |
def do_with_branch(self, branch): |
|
105 |
"""Return branch.last_revision_info().
|
|
106 |
|
|
107 |
The revno is encoded in decimal, the revision_id is encoded as utf8.
|
|
108 |
"""
|
|
109 |
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. |
110 |
return SuccessfulSmartServerResponse(('ok', str(revno), last_revision)) |
2018.5.50
by Wouter van Heyst
Add SmartServerBranchRequestLastRevisionInfo method. |
111 |
|
112 |
||
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
113 |
class SmartServerBranchRequestSetLastRevision(SmartServerLockedBranchRequest): |
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
114 |
|
2018.14.1
by Andrew Bennetts
Update to current hpss branch? Fix lots of test failures. |
115 |
def do_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. |
116 |
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. |
117 |
branch.set_revision_history([]) |
118 |
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. |
119 |
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. |
120 |
return FailedSmartServerResponse( |
2018.12.3
by Andrew Bennetts
Add a Branch.set_last_revision smart method, and make RemoteBranch.set_revision_history use it. |
121 |
('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. |
122 |
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. |
123 |
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. |
124 |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
125 |
|
126 |
class SmartServerBranchRequestLockWrite(SmartServerBranchRequest): |
|
127 |
||
128 |
def do_with_branch(self, branch, branch_token='', repo_token=''): |
|
129 |
if branch_token == '': |
|
130 |
branch_token = None |
|
131 |
if repo_token == '': |
|
132 |
repo_token = None |
|
133 |
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). |
134 |
repo_token = branch.repository.lock_write(token=repo_token) |
135 |
try: |
|
136 |
branch_token = branch.lock_write(token=branch_token) |
|
137 |
finally: |
|
3015.2.6
by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories. |
138 |
# 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). |
139 |
branch.repository.unlock() |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
140 |
except errors.LockContention: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
141 |
return FailedSmartServerResponse(('LockContention',)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
142 |
except errors.TokenMismatch: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
143 |
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. |
144 |
except errors.UnlockableTransport: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
145 |
return FailedSmartServerResponse(('UnlockableTransport',)) |
2872.5.3
by Martin Pool
Pass back LockFailed from smart server lock methods |
146 |
except errors.LockFailed, e: |
147 |
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. |
148 |
if repo_token is None: |
149 |
repo_token = '' |
|
150 |
else: |
|
151 |
branch.repository.leave_lock_in_place() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
152 |
branch.leave_lock_in_place() |
153 |
branch.unlock() |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
154 |
return SuccessfulSmartServerResponse(('ok', branch_token, repo_token)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
155 |
|
156 |
||
157 |
class SmartServerBranchRequestUnlock(SmartServerBranchRequest): |
|
158 |
||
159 |
def do_with_branch(self, branch, branch_token, repo_token): |
|
160 |
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). |
161 |
branch.repository.lock_write(token=repo_token) |
162 |
try: |
|
163 |
branch.lock_write(token=branch_token) |
|
164 |
finally: |
|
165 |
branch.repository.unlock() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
166 |
except errors.TokenMismatch: |
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
167 |
return FailedSmartServerResponse(('TokenMismatch',)) |
3015.2.6
by Robert Collins
In the RemoteServer branch methods handle repositories that cannot be remotely locked like pack repositories. |
168 |
if repo_token: |
169 |
branch.repository.dont_leave_lock_in_place() |
|
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
170 |
branch.dont_leave_lock_in_place() |
171 |
branch.unlock() |
|
2432.4.5
by Robert Collins
Make using SuccessfulSmartServerResponse and FailedSmartServerResponse mandatory rather than optional in smart server logic. |
172 |
return SuccessfulSmartServerResponse(('ok',)) |
2018.5.79
by Andrew Bennetts
Implement RemoteBranch.lock_write/unlock as smart operations. |
173 |