5273.1.5
by Vincent Ladeuil
Merge bzr.dev into cleanup |
1 |
# Copyright (C) 2006-2010 Canonical Ltd
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
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
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
16 |
|
2018.5.20
by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts) |
17 |
"""RemoteTransport client for the smart-server.
|
2018.5.19
by Andrew Bennetts
Add docstrings to all the new modules, and a few other places. |
18 |
|
19 |
This module shouldn't be accessed directly. The classes defined here should be
|
|
2018.5.21
by Andrew Bennetts
Move bzrlib.transport.smart to bzrlib.smart |
20 |
imported from bzrlib.smart.
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
21 |
"""
|
22 |
||
2018.5.147
by Andrew Bennetts
Merge rename-SmartTransport branch. |
23 |
__all__ = ['RemoteTransport', 'RemoteTCPTransport', 'RemoteSSHTransport'] |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
24 |
|
25 |
from cStringIO import StringIO |
|
26 |
||
1910.19.13
by Andrew Bennetts
Address various review comments. |
27 |
from bzrlib import ( |
1551.18.17
by Aaron Bentley
Introduce bzr_remote_path configuration variable |
28 |
config, |
2655.1.1
by John Arbash Meinel
Add some more hpss logging. |
29 |
debug, |
1910.19.13
by Andrew Bennetts
Address various review comments. |
30 |
errors, |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
31 |
remote, |
2655.1.1
by John Arbash Meinel
Add some more hpss logging. |
32 |
trace, |
1910.19.13
by Andrew Bennetts
Address various review comments. |
33 |
transport, |
34 |
urlutils, |
|
35 |
)
|
|
3245.4.37
by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)). |
36 |
from bzrlib.smart import client, medium |
3948.3.2
by Martin Pool
Remove APIs deprecated up to and including 1.6 |
37 |
from bzrlib.symbol_versioning import ( |
38 |
deprecated_method, |
|
39 |
)
|
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
40 |
|
41 |
||
2018.5.19
by Andrew Bennetts
Add docstrings to all the new modules, and a few other places. |
42 |
class _SmartStat(object): |
1752.2.48
by Andrew Bennetts
Support stat |
43 |
|
44 |
def __init__(self, size, mode): |
|
45 |
self.st_size = size |
|
46 |
self.st_mode = mode |
|
47 |
||
48 |
||
3734.2.3
by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we |
49 |
class RemoteTransport(transport.ConnectedTransport): |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
50 |
"""Connection to a smart server.
|
51 |
||
2018.5.4
by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler. |
52 |
The connection holds references to the medium that can be used to send
|
53 |
requests to the server.
|
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
54 |
|
55 |
The connection has a notion of the current directory to which it's
|
|
56 |
connected; this is incorporated in filenames passed to the server.
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
57 |
|
58 |
This supports some higher-level RPC operations and can also be treated
|
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
59 |
like a Transport to do file-like operations.
|
60 |
||
2018.5.4
by Andrew Bennetts
Split smart server VFS logic out into a new file, and start using the command pattern in the SmartServerRequestHandler. |
61 |
The connection can be made over a tcp socket, an ssh pipe or a series of
|
62 |
http requests. There are concrete subclasses for each type:
|
|
2018.5.147
by Andrew Bennetts
Merge rename-SmartTransport branch. |
63 |
RemoteTCPTransport, etc.
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
64 |
"""
|
65 |
||
3805.4.4
by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging. |
66 |
# When making a readv request, cap it at requesting 5MB of data
|
67 |
_max_readv_bytes = 5*1024*1024 |
|
3805.4.3
by John Arbash Meinel
Reorganize the new code, add some debugging. |
68 |
|
2018.5.20
by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts) |
69 |
# IMPORTANT FOR IMPLEMENTORS: RemoteTransport MUST NOT be given encoding
|
1910.19.22
by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring. |
70 |
# responsibilities: Put those on SmartClient or similar. This is vital for
|
71 |
# the ability to support multiple versions of the smart protocol over time:
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
72 |
# RemoteTransport is an adapter from the Transport object model to the
|
1910.19.22
by Robert Collins
Rearrange the readv patch to put the serialise offsets method into the correct class, and document the structure of the classes somewhat better to hint to people writing patches where code should go. Also alter the test so that the client and server components are tested in one place preventing possible encoding skew from occuring. |
73 |
# SmartClient model, not an encoder.
|
74 |
||
2485.8.42
by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing. |
75 |
# FIXME: the medium parameter should be private, only the tests requires
|
76 |
# it. It may be even clearer to define a TestRemoteTransport that handles
|
|
77 |
# the specific cases of providing a _client and/or a _medium, and leave
|
|
78 |
# RemoteTransport as an abstract class.
|
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
79 |
def __init__(self, url, _from_transport=None, medium=None, _client=None): |
1910.19.11
by Andrew Bennetts
General code cleanup based on review comments and other observations. |
80 |
"""Constructor.
|
81 |
||
2485.8.59
by Vincent Ladeuil
Update from review comments. |
82 |
:param _from_transport: Another RemoteTransport instance that this
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
83 |
one is being cloned from. Attributes such as the medium will
|
84 |
be reused.
|
|
85 |
||
3431.3.6
by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport. |
86 |
:param medium: The medium to use for this RemoteTransport. If None,
|
87 |
the medium from the _from_transport is shared. If both this
|
|
88 |
and _from_transport are None, a new medium will be built.
|
|
89 |
_from_transport and medium cannot both be specified.
|
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
90 |
|
2466.2.4
by Andrew Bennetts
Tweaks asked for by Robert. |
91 |
:param _client: Override the _SmartClient used by this transport. This
|
92 |
should only be used for testing purposes; normally this is
|
|
93 |
determined from the medium.
|
|
1910.19.11
by Andrew Bennetts
General code cleanup based on review comments and other observations. |
94 |
"""
|
4053.1.1
by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls. |
95 |
super(RemoteTransport, self).__init__( |
96 |
url, _from_transport=_from_transport) |
|
2485.8.42
by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing. |
97 |
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
98 |
# The medium is the connection, except when we need to share it with
|
99 |
# other objects (RemoteBzrDir, RemoteRepository etc). In these cases
|
|
100 |
# what we want to share is really the shared connection.
|
|
101 |
||
4053.1.1
by Robert Collins
New version of the BzrDir.find_repository verb supporting _network_name to support removing more _ensure_real calls. |
102 |
if (_from_transport is not None |
103 |
and isinstance(_from_transport, RemoteTransport)): |
|
104 |
_client = _from_transport._client |
|
105 |
elif _from_transport is None: |
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
106 |
# If no _from_transport is specified, we need to intialize the
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
107 |
# shared medium.
|
108 |
credentials = None |
|
109 |
if medium is None: |
|
110 |
medium, credentials = self._build_medium() |
|
2655.1.1
by John Arbash Meinel
Add some more hpss logging. |
111 |
if 'hpss' in debug.debug_flags: |
112 |
trace.mutter('hpss: Built a new medium: %s', |
|
113 |
medium.__class__.__name__) |
|
114 |
self._shared_connection = transport._SharedConnection(medium, |
|
3104.4.1
by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium. |
115 |
credentials, |
116 |
self.base) |
|
3431.3.6
by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport. |
117 |
elif medium is None: |
118 |
# No medium was specified, so share the medium from the
|
|
119 |
# _from_transport.
|
|
120 |
medium = self._shared_connection.connection |
|
3313.2.1
by Andrew Bennetts
Change _SmartClient's API to accept a medium and a base, rather than a _SharedConnection. |
121 |
else: |
3431.3.6
by Andrew Bennetts
Update RemoteTransport.__init__ docstring to reflect reality, and disallow passing of both medium and _from_transport. |
122 |
raise AssertionError( |
123 |
"Both _from_transport (%r) and medium (%r) passed to " |
|
124 |
"RemoteTransport.__init__, but these parameters are mutally "
|
|
125 |
"exclusive." % (_from_transport, medium)) |
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
126 |
|
2466.2.2
by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests. |
127 |
if _client is None: |
3431.3.2
by Andrew Bennetts
Remove 'base' from _SmartClient entirely, now that the medium has it. |
128 |
self._client = client._SmartClient(medium) |
2466.2.2
by Andrew Bennetts
Add tests for RemoteTransport.is_readonly in the style of the other remote object tests. |
129 |
else: |
130 |
self._client = _client |
|
1752.2.73
by Andrew Bennetts
Define (and register as bzr+ssh://) SmartSSHTransport, factor out an SSHSubprocess from SFTPSubprocess, and make SmartTransport connect lazily rather than in the constructor. |
131 |
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
132 |
def _build_medium(self): |
2485.8.59
by Vincent Ladeuil
Update from review comments. |
133 |
"""Create the medium if _from_transport does not provide one.
|
2485.8.42
by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing. |
134 |
|
135 |
The medium is analogous to the connection for ConnectedTransport: it
|
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
136 |
allows connection sharing.
|
1752.2.4
by Martin Pool
Refactor SFTP transport to allow code sharing with SSH. |
137 |
"""
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
138 |
# No credentials
|
139 |
return None, None |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
140 |
|
3958.1.1
by Andrew Bennetts
Report traffic on smart media as transport activity. |
141 |
def _report_activity(self, bytes, direction): |
142 |
"""See Transport._report_activity.
|
|
143 |
||
144 |
Does nothing; the smart medium will report activity triggered by a
|
|
145 |
RemoteTransport.
|
|
146 |
"""
|
|
147 |
pass
|
|
148 |
||
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
149 |
def is_readonly(self): |
150 |
"""Smart server transport can do read/write file operations."""
|
|
3297.3.3
by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection. |
151 |
try: |
152 |
resp = self._call2('Transport.is_readonly') |
|
153 |
except errors.UnknownSmartMethod: |
|
2466.2.4
by Andrew Bennetts
Tweaks asked for by Robert. |
154 |
# XXX: nasty hack: servers before 0.16 don't have a
|
155 |
# 'Transport.is_readonly' verb, so we do what clients before 0.16
|
|
156 |
# did: assume False.
|
|
2466.2.1
by Andrew Bennetts
Fix incompatibility with < 0.16 smart servers. |
157 |
return False |
3297.3.3
by Andrew Bennetts
SmartClientRequestProtocol*.read_response_tuple can now raise UnknownSmartMethod. Callers no longer need to do their own ad hoc unknown smart method error detection. |
158 |
if resp == ('yes', ): |
159 |
return True |
|
160 |
elif resp == ('no', ): |
|
161 |
return False |
|
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. |
162 |
else: |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
163 |
raise errors.UnexpectedSmartServerResponse(resp) |
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. |
164 |
|
1752.2.52
by Andrew Bennetts
Flesh out more Remote* methods needed to open and initialise remote branches/trees/repositories. |
165 |
def get_smart_client(self): |
2485.8.42
by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing. |
166 |
return self._get_connection() |
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
167 |
|
168 |
def get_smart_medium(self): |
|
2485.8.42
by Vincent Ladeuil
Finish (almost) remote refactoring. Test suite passing. |
169 |
return self._get_connection() |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
170 |
|
171 |
def _remote_path(self, relpath): |
|
1910.19.14
by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport. |
172 |
"""Returns the Unicode version of the absolute path for relpath."""
|
3104.4.2
by Andrew Bennetts
All tests passing. |
173 |
return self._combine_paths(self._path, relpath) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
174 |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
175 |
def _call(self, method, *args): |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
176 |
resp = self._call2(method, *args) |
177 |
self._ensure_ok(resp) |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
178 |
|
179 |
def _call2(self, method, *args): |
|
180 |
"""Call a method on the remote server."""
|
|
3245.4.24
by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions. |
181 |
try: |
182 |
return self._client.call(method, *args) |
|
183 |
except errors.ErrorFromSmartServer, err: |
|
3840.1.1
by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error. |
184 |
# The first argument, if present, is always a path.
|
185 |
if args: |
|
3840.1.2
by Andrew Bennetts
Improvements suggested by review. |
186 |
context = {'relpath': args[0]} |
3840.1.1
by Andrew Bennetts
Fix RemoteTransport's translation of errors involving paths; it wasn't passing orig_path to _translate_error. |
187 |
else: |
188 |
context = {} |
|
189 |
self._translate_error(err, **context) |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
190 |
|
191 |
def _call_with_body_bytes(self, method, args, body): |
|
192 |
"""Call a method on the remote server with body bytes."""
|
|
3245.4.24
by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions. |
193 |
try: |
194 |
return self._client.call_with_body_bytes(method, args, body) |
|
195 |
except errors.ErrorFromSmartServer, err: |
|
3840.1.2
by Andrew Bennetts
Improvements suggested by review. |
196 |
# The first argument, if present, is always a path.
|
197 |
if args: |
|
198 |
context = {'relpath': args[0]} |
|
199 |
else: |
|
200 |
context = {} |
|
201 |
self._translate_error(err, **context) |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
202 |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
203 |
def has(self, relpath): |
204 |
"""Indicate whether a remote file of the given name exists or not.
|
|
205 |
||
206 |
:see: Transport.has()
|
|
207 |
"""
|
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
208 |
resp = self._call2('has', self._remote_path(relpath)) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
209 |
if resp == ('yes', ): |
210 |
return True |
|
211 |
elif resp == ('no', ): |
|
212 |
return False |
|
213 |
else: |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
214 |
raise errors.UnexpectedSmartServerResponse(resp) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
215 |
|
1752.2.2
by Martin Pool
SSH get method; more development of framework. |
216 |
def get(self, relpath): |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
217 |
"""Return file-like object reading the contents of a remote file.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
218 |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
219 |
:see: Transport.get_bytes()/get_file()
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
220 |
"""
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
221 |
return StringIO(self.get_bytes(relpath)) |
222 |
||
223 |
def get_bytes(self, relpath): |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
224 |
remote = self._remote_path(relpath) |
3245.4.24
by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions. |
225 |
try: |
226 |
resp, response_handler = self._client.call_expecting_body('get', remote) |
|
227 |
except errors.ErrorFromSmartServer, err: |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
228 |
self._translate_error(err, relpath) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
229 |
if resp != ('ok', ): |
3245.4.37
by Andrew Bennetts
Add test for sending ProtocolThreeResponder.send_error(UnknownSmartMethod(...)). |
230 |
response_handler.cancel_read_body() |
3245.4.24
by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions. |
231 |
raise errors.UnexpectedSmartServerResponse(resp) |
232 |
return response_handler.read_body_bytes() |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
233 |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
234 |
def _serialise_optional_mode(self, mode): |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
235 |
if mode is None: |
236 |
return '' |
|
237 |
else: |
|
238 |
return '%d' % mode |
|
239 |
||
240 |
def mkdir(self, relpath, mode=None): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
241 |
resp = self._call2('mkdir', self._remote_path(relpath), |
242 |
self._serialise_optional_mode(mode)) |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
243 |
|
2671.3.9
by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions. |
244 |
def open_write_stream(self, relpath, mode=None): |
245 |
"""See Transport.open_write_stream."""
|
|
2671.3.6
by Robert Collins
Review feedback. |
246 |
self.put_bytes(relpath, "", mode) |
247 |
result = transport.AppendBasedFileStream(self, relpath) |
|
248 |
transport._file_streams[self.abspath(relpath)] = result |
|
249 |
return result |
|
2671.3.2
by Robert Collins
Start open_file_stream logic. |
250 |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
251 |
def put_bytes(self, relpath, upload_contents, mode=None): |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
252 |
# FIXME: upload_file is probably not safe for non-ascii characters -
|
253 |
# should probably just pass all parameters as length-delimited
|
|
254 |
# strings?
|
|
2018.5.131
by Andrew Bennetts
Be strict about unicode passed to transport.put_{bytes,file} and SmartClient.call_with_body_bytes, fixing part of TestLockableFiles_RemoteLockDir.test_read_write. |
255 |
if type(upload_contents) is unicode: |
256 |
# Although not strictly correct, we raise UnicodeEncodeError to be
|
|
257 |
# compatible with other transports.
|
|
258 |
raise UnicodeEncodeError( |
|
259 |
'undefined', upload_contents, 0, 1, |
|
260 |
'put_bytes must be given bytes, not unicode.') |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
261 |
resp = self._call_with_body_bytes('put', |
1910.19.13
by Andrew Bennetts
Address various review comments. |
262 |
(self._remote_path(relpath), self._serialise_optional_mode(mode)), |
263 |
upload_contents) |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
264 |
self._ensure_ok(resp) |
2745.5.2
by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes |
265 |
return len(upload_contents) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
266 |
|
2017.2.1
by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport |
267 |
def put_bytes_non_atomic(self, relpath, bytes, mode=None, |
268 |
create_parent_dir=False, |
|
269 |
dir_mode=None): |
|
1910.19.24
by Robert Collins
Touchup method order. |
270 |
"""See Transport.put_bytes_non_atomic."""
|
271 |
# FIXME: no encoding in the transport!
|
|
2017.2.1
by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport |
272 |
create_parent_str = 'F' |
273 |
if create_parent_dir: |
|
274 |
create_parent_str = 'T' |
|
275 |
||
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
276 |
resp = self._call_with_body_bytes( |
2017.2.1
by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport |
277 |
'put_non_atomic', |
278 |
(self._remote_path(relpath), self._serialise_optional_mode(mode), |
|
279 |
create_parent_str, self._serialise_optional_mode(dir_mode)), |
|
280 |
bytes) |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
281 |
self._ensure_ok(resp) |
2017.2.1
by John Arbash Meinel
Implement put_bytes_non_atomic for the smart transport |
282 |
|
1910.19.24
by Robert Collins
Touchup method order. |
283 |
def put_file(self, relpath, upload_file, mode=None): |
284 |
# its not ideal to seek back, but currently put_non_atomic_file depends
|
|
285 |
# on transports not reading before failing - which is a faulty
|
|
286 |
# assumption I think - RBC 20060915
|
|
287 |
pos = upload_file.tell() |
|
288 |
try: |
|
289 |
return self.put_bytes(relpath, upload_file.read(), mode) |
|
290 |
except: |
|
291 |
upload_file.seek(pos) |
|
292 |
raise
|
|
293 |
||
294 |
def put_file_non_atomic(self, relpath, f, mode=None, |
|
295 |
create_parent_dir=False, |
|
296 |
dir_mode=None): |
|
297 |
return self.put_bytes_non_atomic(relpath, f.read(), mode=mode, |
|
298 |
create_parent_dir=create_parent_dir, |
|
299 |
dir_mode=dir_mode) |
|
1752.2.31
by Martin Pool
[broken] some support for write operations over hpss |
300 |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
301 |
def append_file(self, relpath, from_file, mode=None): |
1910.19.14
by Robert Collins
Fix up all tests to pass, remove a couple more deprecated function calls, and break the dependency on sftp for the smart transport. |
302 |
return self.append_bytes(relpath, from_file.read(), mode) |
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
303 |
|
1910.19.13
by Andrew Bennetts
Address various review comments. |
304 |
def append_bytes(self, relpath, bytes, mode=None): |
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
305 |
resp = self._call_with_body_bytes( |
1910.19.13
by Andrew Bennetts
Address various review comments. |
306 |
'append', |
307 |
(self._remote_path(relpath), self._serialise_optional_mode(mode)), |
|
308 |
bytes) |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
309 |
if resp[0] == 'appended': |
310 |
return int(resp[1]) |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
311 |
raise errors.UnexpectedSmartServerResponse(resp) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
312 |
|
313 |
def delete(self, relpath): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
314 |
resp = self._call2('delete', self._remote_path(relpath)) |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
315 |
self._ensure_ok(resp) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
316 |
|
2634.1.1
by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch. |
317 |
def external_url(self): |
318 |
"""See bzrlib.transport.Transport.external_url."""
|
|
319 |
# the external path for RemoteTransports is the base
|
|
320 |
return self.base |
|
321 |
||
3183.2.1
by Andrew Bennetts
Set the recommended page size for RemoteTransport to 64k. |
322 |
def recommended_page_size(self): |
323 |
"""Return the recommended page size for this transport."""
|
|
324 |
return 64 * 1024 |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
325 |
|
2745.5.1
by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv`` |
326 |
def _readv(self, relpath, offsets): |
1910.19.17
by John Arbash Meinel
Implement readv() for the SmartServer |
327 |
if not offsets: |
328 |
return
|
|
329 |
||
330 |
offsets = list(offsets) |
|
1910.19.20
by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks |
331 |
|
332 |
sorted_offsets = sorted(offsets) |
|
333 |
coalesced = list(self._coalesce_offsets(sorted_offsets, |
|
334 |
limit=self._max_readv_combine, |
|
3876.1.1
by John Arbash Meinel
Fix bug #303538 by capping the max per-hunk read size at 100MB. |
335 |
fudge_factor=self._bytes_to_read_before_seek, |
336 |
max_size=self._max_readv_bytes)) |
|
1910.19.20
by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks |
337 |
|
3805.4.3
by John Arbash Meinel
Reorganize the new code, add some debugging. |
338 |
# now that we've coallesced things, avoid making enormous requests
|
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
339 |
requests = [] |
340 |
cur_request = [] |
|
341 |
cur_len = 0 |
|
342 |
for c in coalesced: |
|
3805.4.4
by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging. |
343 |
if c.length + cur_len > self._max_readv_bytes: |
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
344 |
requests.append(cur_request) |
3805.4.8
by John Arbash Meinel
When starting a new list, we need to start it with the current entry |
345 |
cur_request = [c] |
346 |
cur_len = c.length |
|
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
347 |
continue
|
348 |
cur_request.append(c) |
|
349 |
cur_len += c.length |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
350 |
if cur_request: |
351 |
requests.append(cur_request) |
|
3805.4.3
by John Arbash Meinel
Reorganize the new code, add some debugging. |
352 |
if 'hpss' in debug.debug_flags: |
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
353 |
trace.mutter('%s.readv %s offsets => %s coalesced' |
354 |
' => %s requests (%s)', |
|
3805.4.4
by John Arbash Meinel
Change to a 5MB request chunk, and add a bit more debug logging. |
355 |
self.__class__.__name__, len(offsets), len(coalesced), |
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
356 |
len(requests), sum(map(len, requests))) |
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
357 |
# Cache the results, but only until they have been fulfilled
|
358 |
data_map = {} |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
359 |
# turn the list of offsets into a single stack to iterate
|
3649.5.1
by John Arbash Meinel
Change _StatefulDecoder._in_bytes into a _in_bytes_list |
360 |
offset_stack = iter(offsets) |
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
361 |
# using a list so it can be modified when passing down and coming back
|
3805.4.7
by John Arbash Meinel
Fix a typo. |
362 |
next_offset = [offset_stack.next()] |
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
363 |
for cur_request in requests: |
364 |
try: |
|
365 |
result = self._client.call_with_body_readv_array( |
|
366 |
('readv', self._remote_path(relpath),), |
|
367 |
[(c.start, c.length) for c in cur_request]) |
|
368 |
resp, response_handler = result |
|
369 |
except errors.ErrorFromSmartServer, err: |
|
3840.1.2
by Andrew Bennetts
Improvements suggested by review. |
370 |
self._translate_error(err, relpath) |
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
371 |
|
372 |
if resp[0] != 'readv': |
|
373 |
# This should raise an exception
|
|
374 |
response_handler.cancel_read_body() |
|
375 |
raise errors.UnexpectedSmartServerResponse(resp) |
|
376 |
||
377 |
for res in self._handle_response(offset_stack, cur_request, |
|
378 |
response_handler, |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
379 |
data_map, |
380 |
next_offset): |
|
3805.4.1
by John Arbash Meinel
Change the default readv() packing rules. |
381 |
yield res |
382 |
||
383 |
def _handle_response(self, offset_stack, coalesced, response_handler, |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
384 |
data_map, next_offset): |
385 |
cur_offset_and_size = next_offset[0] |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
386 |
# FIXME: this should know how many bytes are needed, for clarity.
|
3245.4.24
by Andrew Bennetts
Consistently raise errors from the server as ErrorFromSmartServer exceptions. |
387 |
data = response_handler.read_body_bytes() |
3649.5.3
by John Arbash Meinel
Don't downsize the data buffer while reading. |
388 |
data_offset = 0 |
1910.19.20
by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks |
389 |
for c_offset in coalesced: |
390 |
if len(data) < c_offset.length: |
|
391 |
raise errors.ShortReadvError(relpath, c_offset.start, |
|
392 |
c_offset.length, actual=len(data)) |
|
393 |
for suboffset, subsize in c_offset.ranges: |
|
394 |
key = (c_offset.start+suboffset, subsize) |
|
3649.5.3
by John Arbash Meinel
Don't downsize the data buffer while reading. |
395 |
this_data = data[data_offset+suboffset: |
396 |
data_offset+suboffset+subsize] |
|
397 |
# Special case when the data is in-order, rather than packing
|
|
398 |
# into a map and then back out again. Benchmarking shows that
|
|
399 |
# this has 100% hit rate, but leave in the data_map work just
|
|
400 |
# in case.
|
|
401 |
# TODO: Could we get away with using buffer() to avoid the
|
|
402 |
# memory copy? Callers would need to realize they may
|
|
403 |
# not have a real string.
|
|
404 |
if key == cur_offset_and_size: |
|
405 |
yield cur_offset_and_size[0], this_data |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
406 |
cur_offset_and_size = next_offset[0] = offset_stack.next() |
3649.5.3
by John Arbash Meinel
Don't downsize the data buffer while reading. |
407 |
else: |
408 |
data_map[key] = this_data |
|
409 |
data_offset += c_offset.length |
|
1910.19.20
by John Arbash Meinel
Update the client-side requests, so that we collapse nearby ranges, rather than requesting lots of small chunks |
410 |
|
411 |
# Now that we've read some data, see if we can yield anything back
|
|
412 |
while cur_offset_and_size in data_map: |
|
413 |
this_data = data_map.pop(cur_offset_and_size) |
|
414 |
yield cur_offset_and_size[0], this_data |
|
3805.4.5
by John Arbash Meinel
when splitting a readv, we need to start at the last offset, |
415 |
cur_offset_and_size = next_offset[0] = offset_stack.next() |
1910.19.17
by John Arbash Meinel
Implement readv() for the SmartServer |
416 |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
417 |
def rename(self, rel_from, rel_to): |
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
418 |
self._call('rename', |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
419 |
self._remote_path(rel_from), |
420 |
self._remote_path(rel_to)) |
|
421 |
||
422 |
def move(self, rel_from, rel_to): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
423 |
self._call('move', |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
424 |
self._remote_path(rel_from), |
425 |
self._remote_path(rel_to)) |
|
426 |
||
427 |
def rmdir(self, relpath): |
|
428 |
resp = self._call('rmdir', self._remote_path(relpath)) |
|
429 |
||
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
430 |
def _ensure_ok(self, resp): |
431 |
if resp[0] != 'ok': |
|
432 |
raise errors.UnexpectedSmartServerResponse(resp) |
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
433 |
|
3840.1.2
by Andrew Bennetts
Improvements suggested by review. |
434 |
def _translate_error(self, err, relpath=None): |
435 |
remote._translate_error(err, path=relpath) |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
436 |
|
437 |
def disconnect(self): |
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
438 |
self.get_smart_medium().disconnect() |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
439 |
|
440 |
def stat(self, relpath): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
441 |
resp = self._call2('stat', self._remote_path(relpath)) |
1752.2.48
by Andrew Bennetts
Support stat |
442 |
if resp[0] == 'stat': |
2018.5.19
by Andrew Bennetts
Add docstrings to all the new modules, and a few other places. |
443 |
return _SmartStat(int(resp[1]), int(resp[2], 8)) |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
444 |
raise errors.UnexpectedSmartServerResponse(resp) |
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
445 |
|
446 |
## def lock_read(self, relpath):
|
|
447 |
## """Lock the given file for shared (read) access.
|
|
448 |
## :return: A lock object, which should be passed to Transport.unlock()
|
|
449 |
## """
|
|
450 |
## # The old RemoteBranch ignore lock for reading, so we will
|
|
451 |
## # continue that tradition and return a bogus lock object.
|
|
452 |
## class BogusLock(object):
|
|
453 |
## def __init__(self, path):
|
|
454 |
## self.path = path
|
|
455 |
## def unlock(self):
|
|
456 |
## pass
|
|
457 |
## return BogusLock(relpath)
|
|
458 |
||
1752.2.42
by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport |
459 |
def listable(self): |
460 |
return True |
|
461 |
||
462 |
def list_dir(self, relpath): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
463 |
resp = self._call2('list_dir', self._remote_path(relpath)) |
1752.2.42
by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport |
464 |
if resp[0] == 'names': |
1752.2.47
by Andrew Bennetts
Fix SmartTransport.list_dir to return ascii. |
465 |
return [name.encode('ascii') for name in resp[1:]] |
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
466 |
raise errors.UnexpectedSmartServerResponse(resp) |
1752.2.42
by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport |
467 |
|
468 |
def iter_files_recursive(self): |
|
2018.2.4
by Robert Collins
separate out the client medium from the client encoding protocol for the smart server. |
469 |
resp = self._call2('iter_files_recursive', self._remote_path('')) |
1752.2.42
by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport |
470 |
if resp[0] == 'names': |
471 |
return resp[1:] |
|
3779.3.2
by Andrew Bennetts
Unify error translation done in bzrlib.remote and bzrlib.transport.remote. |
472 |
raise errors.UnexpectedSmartServerResponse(resp) |
1752.2.42
by Andrew Bennetts
Add list_dir and iter_files_recursive smart transport |
473 |
|
1910.19.1
by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used |
474 |
|
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
475 |
class RemoteTCPTransport(RemoteTransport): |
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
476 |
"""Connection to smart server over plain tcp.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
477 |
|
2018.2.3
by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol. |
478 |
This is essentially just a factory to get 'RemoteTransport(url,
|
479 |
SmartTCPClientMedium).
|
|
480 |
"""
|
|
481 |
||
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
482 |
def _build_medium(self): |
3431.3.1
by Andrew Bennetts
First rough cut of a fix for bug #230550, by adding .base to SmartClientMedia rather than relying on other objects to track this accurately while reusing client media. |
483 |
client_medium = medium.SmartTCPClientMedium( |
484 |
self._host, self._port, self.base) |
|
485 |
return client_medium, None |
|
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
486 |
|
487 |
||
3453.5.1
by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs. |
488 |
class RemoteTCPTransportV2Only(RemoteTransport): |
489 |
"""Connection to smart server over plain tcp with the client hard-coded to
|
|
490 |
assume protocol v2 and remote server version <= 1.6.
|
|
491 |
||
492 |
This should only be used for testing.
|
|
493 |
"""
|
|
494 |
||
495 |
def _build_medium(self): |
|
496 |
client_medium = medium.SmartTCPClientMedium( |
|
497 |
self._host, self._port, self.base) |
|
498 |
client_medium._protocol_version = 2 |
|
3453.5.7
by Andrew Bennetts
Fix error introduced by merge. |
499 |
client_medium._remember_remote_is_before((1, 6)) |
3453.5.1
by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs. |
500 |
return client_medium, None |
501 |
||
502 |
||
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
503 |
class RemoteSSHTransport(RemoteTransport): |
2018.2.27
by Andrew Bennetts
Merge from bzr.dev |
504 |
"""Connection to smart server over SSH.
|
505 |
||
506 |
This is essentially just a factory to get 'RemoteTransport(url,
|
|
507 |
SmartSSHClientMedium).
|
|
508 |
"""
|
|
509 |
||
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
510 |
def _build_medium(self): |
1551.18.17
by Aaron Bentley
Introduce bzr_remote_path configuration variable |
511 |
location_config = config.LocationConfig(self.base) |
512 |
bzr_remote_path = location_config.get_bzr_remote_path() |
|
3777.1.3
by Aaron Bentley
Use SSH default username from authentication.conf |
513 |
user = self._user |
514 |
if user is None: |
|
515 |
auth = config.AuthenticationConfig() |
|
516 |
user = auth.get_user('ssh', self._host, self._port) |
|
5284.5.1
by Andrew Bennetts
Use socketpairs (rather than pipes) for SSH subprocesses where possible, and formalise some internal APIs a little more. |
517 |
ssh_params = medium.SSHParams(self._host, self._port, user, |
518 |
self._password, bzr_remote_path) |
|
519 |
client_medium = medium.SmartSSHClientMedium(self.base, ssh_params) |
|
3777.1.3
by Aaron Bentley
Use SSH default username from authentication.conf |
520 |
return client_medium, (user, self._password) |
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
521 |
|
522 |
||
523 |
class RemoteHTTPTransport(RemoteTransport): |
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
524 |
"""Just a way to connect between a bzr+http:// url and http://.
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
525 |
|
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
526 |
This connection operates slightly differently than the RemoteSSHTransport.
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
527 |
It uses a plain http:// transport underneath, which defines what remote
|
528 |
.bzr/smart URL we are connected to. From there, all paths that are sent are
|
|
529 |
sent as relative paths, this way, the remote side can properly
|
|
2190.1.5
by John Arbash Meinel
Typo fix from Martin |
530 |
de-reference them, since it is likely doing rewrite rules to translate an
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
531 |
HTTP path into a local path.
|
532 |
"""
|
|
533 |
||
2485.8.59
by Vincent Ladeuil
Update from review comments. |
534 |
def __init__(self, base, _from_transport=None, http_transport=None): |
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
535 |
if http_transport is None: |
2485.8.46
by Vincent Ladeuil
Add some remarks about current limitations in connection sharing. |
536 |
# FIXME: the password may be lost here because it appears in the
|
537 |
# url only for an intial construction (when the url came from the
|
|
538 |
# command-line).
|
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
539 |
http_url = base[len('bzr+'):] |
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
540 |
self._http_transport = transport.get_transport(http_url) |
541 |
else: |
|
542 |
self._http_transport = http_transport |
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
543 |
super(RemoteHTTPTransport, self).__init__( |
544 |
base, _from_transport=_from_transport) |
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
545 |
|
2485.8.54
by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium. |
546 |
def _build_medium(self): |
547 |
# We let http_transport take care of the credentials
|
|
548 |
return self._http_transport.get_smart_medium(), None |
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
549 |
|
3104.4.2
by Andrew Bennetts
All tests passing. |
550 |
def _remote_path(self, relpath): |
2485.8.29
by Vincent Ladeuil
Cometic changes (and a typo). |
551 |
"""After connecting, HTTP Transport only deals in relative URLs."""
|
2208.4.2
by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories. |
552 |
# Adjust the relpath based on which URL this smart transport is
|
553 |
# connected to.
|
|
3104.4.1
by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium. |
554 |
http_base = urlutils.normalize_url(self.get_smart_medium().base) |
2208.4.2
by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories. |
555 |
url = urlutils.join(self.base[len('bzr+'):], relpath) |
556 |
url = urlutils.normalize_url(url) |
|
2485.8.26
by Vincent Ladeuil
Finish remote refactoring. Test suite passing. |
557 |
return urlutils.relative_url(http_base, url) |
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
558 |
|
559 |
def clone(self, relative_url): |
|
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
560 |
"""Make a new RemoteHTTPTransport related to me.
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
561 |
|
562 |
This is re-implemented rather than using the default
|
|
2413.2.1
by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc. |
563 |
RemoteTransport.clone() because we must be careful about the underlying
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
564 |
http transport.
|
2208.4.2
by Andrew Bennetts
Always POST to the same .bzr/smart URL for a given branch, even when accessing files in subdirectories. |
565 |
|
566 |
Also, the cloned smart transport will POST to the same .bzr/smart
|
|
567 |
location as this transport (although obviously the relative paths in the
|
|
568 |
smart requests may be different). This is so that the server doesn't
|
|
2208.4.3
by Andrew Bennetts
Let SmartHTTPTransport.clone('..') continue to POST to the cloned URL (unlike clone('child')). |
569 |
have to handle .bzr/smart requests at arbitrary places inside .bzr
|
570 |
directories, just at the initial URL the user uses.
|
|
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
571 |
"""
|
572 |
if relative_url: |
|
573 |
abs_url = self.abspath(relative_url) |
|
574 |
else: |
|
575 |
abs_url = self.base |
|
2485.8.59
by Vincent Ladeuil
Update from review comments. |
576 |
return RemoteHTTPTransport(abs_url, |
577 |
_from_transport=self, |
|
3104.4.2
by Andrew Bennetts
All tests passing. |
578 |
http_transport=self._http_transport) |
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
579 |
|
3878.4.6
by Vincent Ladeuil
Fix bug #270863 by preserving 'bzr+http[s]' decorator. |
580 |
def _redirected_to(self, source, target): |
581 |
"""See transport._redirected_to"""
|
|
582 |
redirected = self._http_transport._redirected_to(source, target) |
|
583 |
if (redirected is not None |
|
584 |
and isinstance(redirected, type(self._http_transport))): |
|
585 |
return RemoteHTTPTransport('bzr+' + redirected.external_url(), |
|
586 |
http_transport=redirected) |
|
587 |
else: |
|
588 |
# Either None or a transport for a different protocol
|
|
589 |
return redirected |
|
590 |
||
2190.1.3
by John Arbash Meinel
Implement bzr+http:// |
591 |
|
4011.4.1
by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://. |
592 |
class HintingSSHTransport(transport.Transport): |
593 |
"""Simple transport that handles ssh:// and points out bzr+ssh://."""
|
|
594 |
||
595 |
def __init__(self, url): |
|
4032.1.2
by John Arbash Meinel
Track down a few more files that have trailing whitespace. |
596 |
raise errors.UnsupportedProtocol(url, |
4011.4.2
by Jelmer Vernooij
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with. |
597 |
'bzr supports bzr+ssh to operate over ssh, use "bzr+%s".' % url) |
4011.4.1
by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://. |
598 |
|
599 |
||
2018.5.20
by Andrew Bennetts
Move bzrlib/transport/smart/_smart.py to bzrlib/transport/remote.py and rename SmartTransport to RemoteTransport (Robert Collins, Andrew Bennetts) |
600 |
def get_test_permutations(): |
601 |
"""Return (transport, server) permutations for testing."""
|
|
602 |
### We may need a little more test framework support to construct an
|
|
603 |
### appropriate RemoteTransport in the future.
|
|
5017.3.18
by Vincent Ladeuil
Move SmartTCPServer_for_testing and friends to bzrlib.tests.test_server |
604 |
from bzrlib.tests import test_server |
605 |
return [(RemoteTCPTransport, test_server.SmartTCPServer_for_testing)] |