/brz/remove-bazaar

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