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