/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
1
# Copyright (C) 2005, 2006, 2007, 2008 Canonical Ltd
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
2
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
7
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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.
1887.1.1 by Adeodato Simó
Do not separate paragraphs in the copyright statement with blank lines,
12
#
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
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
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
16
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
17
"""Transport is an abstraction layer to handle file access.
18
19
The abstraction is to allow access from the local filesystem, as well
20
as remote (such as http or sftp).
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
21
22
Transports are constructed from a string, being a URL or (as a degenerate
23
case) a local filesystem path.  This is typically the top directory of
24
a bzrdir, repository, or similar object we are interested in working with.
25
The Transport returned has methods to read, write and manipulate files within
26
it.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
27
"""
28
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
29
from cStringIO import StringIO
30
import re
31
import sys
32
33
from bzrlib.lazy_import import lazy_import
34
lazy_import(globals(), """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
35
import errno
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
36
from stat import S_ISDIR
1685.1.70 by Wouter van Heyst
working on get_parent, set_parent and relative urls, broken
37
import urllib
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
38
import urlparse
1530.1.1 by Robert Collins
Minimal infrastructure to test TransportTestProviderAdapter.
39
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
40
from bzrlib import (
41
    errors,
42
    osutils,
43
    symbol_versioning,
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
44
    ui,
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
45
    urlutils,
46
    )
1996.3.6 by John Arbash Meinel
Find a few places that weren't importing their dependencies.
47
""")
48
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
49
from bzrlib.symbol_versioning import (
50
        deprecated_method,
51
        deprecated_function,
1773.4.1 by Martin Pool
Add pyflakes makefile target; fix many warnings
52
        DEPRECATED_PARAMETER,
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
53
        )
2164.2.21 by Vincent Ladeuil
Take bundles into account.
54
from bzrlib.trace import (
55
    mutter,
56
    )
2241.2.1 by ghigo
Add the TransportRegistry class
57
from bzrlib import registry
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
58
59
2671.3.2 by Robert Collins
Start open_file_stream logic.
60
# a dictionary of open file streams. Keys are absolute paths, values are
61
# transport defined.
62
_file_streams = {}
63
64
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
65
def _get_protocol_handlers():
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
66
    """Return a dictionary of {urlprefix: [factory]}"""
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
67
    return transport_list_registry
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
68
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
69
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
70
def _set_protocol_handlers(new_handlers):
71
    """Replace the current protocol handlers dictionary.
72
73
    WARNING this will remove all build in protocols. Use with care.
74
    """
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
75
    global transport_list_registry
76
    transport_list_registry = new_handlers
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
77
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
78
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
79
def _clear_protocol_handlers():
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
80
    global transport_list_registry
81
    transport_list_registry = TransportListRegistry()
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
82
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
83
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
84
def _get_transport_modules():
85
    """Return a list of the modules providing transports."""
86
    modules = set()
3882.1.1 by Martin Pool
Don't call iteritems on transport_list_registry, because it may change during iteration
87
    for prefix, factory_list in transport_list_registry.items():
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
88
        for factory in factory_list:
2241.2.2 by ghigo
Create the TransportList class
89
            if hasattr(factory, "_module_name"):
90
                modules.add(factory._module_name)
1540.3.12 by Martin Pool
Multiple transports can be registered for any protocol, and they are
91
            else:
2241.2.2 by ghigo
Create the TransportList class
92
                modules.add(factory._obj.__module__)
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
93
    # Add chroot directly, because there is no handler registered for it.
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
94
    modules.add('bzrlib.transport.chroot')
1530.1.19 by Robert Collins
Make transport test adapter tests reliable.
95
    result = list(modules)
96
    result.sort()
97
    return result
1530.1.11 by Robert Collins
Push the transport permutations list into each transport module allowing for automatic testing of new modules that are registered as transports.
98
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
99
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
100
class TransportListRegistry(registry.Registry):
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
101
    """A registry which simplifies tracking available Transports.
102
3764.1.1 by Vincent Ladeuil
Fix typo
103
    A registration of a new protocol requires two steps:
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
104
    1) register the prefix with the function register_transport( )
105
    2) register the protocol provider with the function
106
    register_transport_provider( ) ( and the "lazy" variant )
107
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
108
    This is needed because:
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
109
    a) a single provider can support multple protcol ( like the ftp
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
110
    provider which supports both the ftp:// and the aftp:// protocols )
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
111
    b) a single protocol can have multiple providers ( like the http://
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
112
    protocol which is supported by both the urllib and pycurl provider )
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
113
    """
114
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
115
    def register_transport_provider(self, key, obj):
116
        self.get(key).insert(0, registry._ObjectGetter(obj))
117
118
    def register_lazy_transport_provider(self, key, module_name, member_name):
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
119
        self.get(key).insert(0,
2241.2.1 by ghigo
Add the TransportRegistry class
120
                registry._LazyObjectGetter(module_name, member_name))
121
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
122
    def register_transport(self, key, help=None):
123
        self.register(key, [], help)
2241.2.1 by ghigo
Add the TransportRegistry class
124
125
    def set_default_transport(self, key=None):
126
        """Return either 'key' or the default key if key is None"""
127
        self._default_key = key
128
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
129
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
130
transport_list_registry = TransportListRegistry()
2241.2.1 by ghigo
Add the TransportRegistry class
131
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
132
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
133
def register_transport_proto(prefix, help=None, info=None,
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
134
                             register_netloc=False):
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
135
    transport_list_registry.register_transport(prefix, help)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
136
    if register_netloc:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
137
        if not prefix.endswith('://'):
138
            raise ValueError(prefix)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
139
        register_urlparse_netloc_protocol(prefix[:-3])
2241.2.1 by ghigo
Add the TransportRegistry class
140
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
141
2241.2.1 by ghigo
Add the TransportRegistry class
142
def register_lazy_transport(prefix, module, classname):
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
143
    if not prefix in transport_list_registry:
2241.2.2 by ghigo
Create the TransportList class
144
        register_transport_proto(prefix)
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
145
    transport_list_registry.register_lazy_transport_provider(prefix, module, classname)
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
146
147
2241.2.1 by ghigo
Add the TransportRegistry class
148
def register_transport(prefix, klass, override=DEPRECATED_PARAMETER):
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
149
    if not prefix in transport_list_registry:
2241.2.2 by ghigo
Create the TransportList class
150
        register_transport_proto(prefix)
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
151
    transport_list_registry.register_transport_provider(prefix, klass)
2241.2.1 by ghigo
Add the TransportRegistry class
152
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
153
1636.1.2 by Robert Collins
More review fixen to the relpath at '/' fixes.
154
def register_urlparse_netloc_protocol(protocol):
1636.1.1 by Robert Collins
Fix calling relpath() and abspath() on transports at their root.
155
    """Ensure that protocol is setup to be used with urlparse netloc parsing."""
156
    if protocol not in urlparse.uses_netloc:
157
        urlparse.uses_netloc.append(protocol)
158
2241.3.4 by ghigo
Updates on the basis of John Arbash Meinel comments
159
2485.8.61 by Vincent Ladeuil
From review comments, use a private scheme for testing.
160
def _unregister_urlparse_netloc_protocol(protocol):
161
    """Remove protocol from urlparse netloc parsing.
162
163
    Except for tests, you should never use that function. Using it with 'http',
164
    for example, will break all http transports.
165
    """
166
    if protocol in urlparse.uses_netloc:
167
        urlparse.uses_netloc.remove(protocol)
168
169
2241.3.5 by ghigo
update to the latest bzr.dev
170
def unregister_transport(scheme, factory):
171
    """Unregister a transport."""
172
    l = transport_list_registry.get(scheme)
173
    for i in l:
174
        o = i.get_obj( )
175
        if o == factory:
176
            transport_list_registry.get(scheme).remove(i)
177
            break
178
    if len(l) == 0:
179
        transport_list_registry.remove(scheme)
180
181
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
182
class _CoalescedOffset(object):
183
    """A data container for keeping track of coalesced offsets."""
184
185
    __slots__ = ['start', 'length', 'ranges']
186
187
    def __init__(self, start, length, ranges):
188
        self.start = start
189
        self.length = length
190
        self.ranges = ranges
191
192
    def __cmp__(self, other):
193
        return cmp((self.start, self.length, self.ranges),
194
                   (other.start, other.length, other.ranges))
195
3059.2.2 by Vincent Ladeuil
Read http responses on demand without buffering the whole body
196
    def __repr__(self):
197
        return '%s(%r, %r, %r)' % (self.__class__.__name__,
198
            self.start, self.length, self.ranges)
199
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
200
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
201
class LateReadError(object):
202
    """A helper for transports which pretends to be a readable file.
203
204
    When read() is called, errors.ReadError is raised.
205
    """
206
207
    def __init__(self, path):
208
        self._path = path
209
210
    def close(self):
211
        """a no-op - do nothing."""
212
2052.6.2 by Robert Collins
Merge bzr.dev.
213
    def _fail(self):
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
214
        """Raise ReadError."""
215
        raise errors.ReadError(self._path)
216
2052.6.2 by Robert Collins
Merge bzr.dev.
217
    def __iter__(self):
218
        self._fail()
219
220
    def read(self, count=-1):
221
        self._fail()
222
223
    def readlines(self):
224
        self._fail()
225
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
226
2671.3.6 by Robert Collins
Review feedback.
227
class FileStream(object):
228
    """Base class for FileStreams."""
229
230
    def __init__(self, transport, relpath):
231
        """Create a FileStream for relpath on transport."""
232
        self.transport = transport
233
        self.relpath = relpath
234
235
    def _close(self):
236
        """A hook point for subclasses that need to take action on close."""
237
238
    def close(self):
239
        self._close()
240
        del _file_streams[self.transport.abspath(self.relpath)]
241
242
243
class FileFileStream(FileStream):
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
244
    """A file stream object returned by open_write_stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
245
2671.3.6 by Robert Collins
Review feedback.
246
    This version uses a file like object to perform writes.
247
    """
248
249
    def __init__(self, transport, relpath, file_handle):
250
        FileStream.__init__(self, transport, relpath)
251
        self.file_handle = file_handle
252
253
    def _close(self):
254
        self.file_handle.close()
255
256
    def write(self, bytes):
3635.1.2 by Robert Collins
Add osutils.pump_string_file helper function.
257
        osutils.pump_string_file(bytes, self.file_handle)
2671.3.6 by Robert Collins
Review feedback.
258
259
260
class AppendBasedFileStream(FileStream):
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
261
    """A file stream object returned by open_write_stream.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
262
2671.3.6 by Robert Collins
Review feedback.
263
    This version uses append on a transport to perform writes.
264
    """
265
266
    def write(self, bytes):
267
        self.transport.append_bytes(self.relpath, bytes)
268
269
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
270
class Transport(object):
271
    """This class encapsulates methods for retrieving or putting a file
272
    from/to a storage location.
273
274
    Most functions have a _multi variant, which allows you to queue up
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
275
    multiple requests. They generally have a dumb base implementation
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
276
    which just iterates over the arguments, but smart Transport
277
    implementations can do pipelining.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
278
    In general implementations should support having a generator or a list
279
    as an argument (ie always iterate, never index)
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
280
281
    :ivar base: Base URL for the transport; should always end in a slash.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
282
    """
283
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
284
    # implementations can override this if it is more efficient
285
    # for them to combine larger read chunks together
1864.5.4 by John Arbash Meinel
play around with tuning the partial reads.
286
    _max_readv_combine = 50
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
287
    # It is better to read this much more data in order, rather
288
    # than doing another seek. Even for the local filesystem,
289
    # there is a benefit in just reading.
290
    # TODO: jam 20060714 Do some real benchmarking to figure out
291
    #       where the biggest benefit between combining reads and
1864.5.8 by John Arbash Meinel
Cleanup and NEWS
292
    #       and seeking is. Consider a runtime auto-tune.
1864.5.4 by John Arbash Meinel
play around with tuning the partial reads.
293
    _bytes_to_read_before_seek = 0
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
294
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
295
    def __init__(self, base):
3734.2.3 by Vincent Ladeuil
Don't use multiple inheritance for http smart medium since we
296
        super(Transport, self).__init__()
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
297
        self.base = base
298
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
299
    def _translate_error(self, e, path, raise_generic=True):
300
        """Translate an IOError or OSError into an appropriate bzr error.
301
302
        This handles things like ENOENT, ENOTDIR, EEXIST, and EACCESS
303
        """
1963.2.6 by Robey Pointer
pychecker is on crack; go back to using 'is None'.
304
        if getattr(e, 'errno', None) is not None:
3146.4.1 by Aaron Bentley
Python 2.5 on win32 can emit errno.EINVAL when listing a non-directory
305
            if e.errno in (errno.ENOENT, errno.ENOTDIR, errno.EINVAL):
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
306
                raise errors.NoSuchFile(path, extra=e)
1185.31.58 by John Arbash Meinel
Updating for new transport tests so that they pass on win32
307
            # I would rather use errno.EFOO, but there doesn't seem to be
308
            # any matching for 267
309
            # This is the error when doing a listdir on a file:
310
            # WindowsError: [Errno 267] The directory name is invalid
311
            if sys.platform == 'win32' and e.errno in (errno.ESRCH, 267):
312
                raise errors.NoSuchFile(path, extra=e)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
313
            if e.errno == errno.EEXIST:
314
                raise errors.FileExists(path, extra=e)
315
            if e.errno == errno.EACCES:
316
                raise errors.PermissionDenied(path, extra=e)
1553.5.10 by Martin Pool
New DirectoryNotEmpty exception, and raise this from local and memory
317
            if e.errno == errno.ENOTEMPTY:
318
                raise errors.DirectoryNotEmpty(path, extra=e)
1558.10.1 by Aaron Bentley
Handle lockdirs over NFS properly
319
            if e.errno == errno.EBUSY:
320
                raise errors.ResourceBusy(path, extra=e)
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
321
        if raise_generic:
322
            raise errors.TransportError(orig_error=e)
323
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
324
    def clone(self, offset=None):
325
        """Return a new Transport object, cloned from the current location,
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
326
        using a subdirectory or parent directory. This allows connections
1185.11.6 by John Arbash Meinel
Made HttpTransport handle a request for a parent directory differently.
327
        to be pooled, rather than a new one needed for each subdir.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
328
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
329
        raise NotImplementedError(self.clone)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
330
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
331
    def create_prefix(self):
4294.2.10 by Robert Collins
Review feedback.
332
        """Create all the directories leading down to self.base."""
4294.2.1 by Robert Collins
Move directory checking for bzr push options into Branch.create_clone_on_transport.
333
        cur_transport = self
334
        needed = [cur_transport]
335
        # Recurse upwards until we can create a directory successfully
336
        while True:
337
            new_transport = cur_transport.clone('..')
338
            if new_transport.base == cur_transport.base:
339
                raise errors.BzrCommandError(
340
                    "Failed to create path prefix for %s."
341
                    % cur_transport.base)
342
            try:
343
                new_transport.mkdir('.')
344
            except errors.NoSuchFile:
345
                needed.append(new_transport)
346
                cur_transport = new_transport
347
            except errors.FileExists:
348
                break
349
            else:
350
                break
351
        # Now we only need to create child directories
352
        while needed:
353
            cur_transport = needed.pop()
354
            cur_transport.ensure_base()
355
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
356
    def ensure_base(self):
357
        """Ensure that the directory this transport references exists.
358
359
        This will create a directory if it doesn't exist.
360
        :return: True if the directory was created, False otherwise.
361
        """
362
        # The default implementation just uses "Easier to ask for forgiveness
363
        # than permission". We attempt to create the directory, and just
2805.3.1 by Martin Pool
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
364
        # suppress FileExists and PermissionDenied (for Windows) exceptions.
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
365
        try:
366
            self.mkdir('.')
2805.3.1 by Martin Pool
Transport.ensure_base should ignore PermissionDenied when trying to create the directory (Axel Kollmorgen)
367
        except (errors.FileExists, errors.PermissionDenied):
2475.3.2 by John Arbash Meinel
Add Transport.ensure_base()
368
            return False
369
        else:
370
            return True
371
2634.1.1 by Robert Collins
(robertc) Reinstate the accidentally backed out external_url patch.
372
    def external_url(self):
373
        """Return a URL for self that can be given to an external process.
374
375
        There is no guarantee that the URL can be accessed from a different
376
        machine - e.g. file:/// urls are only usable on the local machine,
377
        sftp:/// urls when the server is only bound to localhost are only
378
        usable from localhost etc.
379
380
        NOTE: This method may remove security wrappers (e.g. on chroot
381
        transports) and thus should *only* be used when the result will not
382
        be used to obtain a new transport within bzrlib. Ideally chroot
383
        transports would know enough to cause the external url to be the exact
384
        one used that caused the chrooting in the first place, but that is not
385
        currently the case.
386
387
        :return: A URL that can be given to another process.
388
        :raises InProcessTransport: If the transport is one that cannot be
389
            accessed out of the current process (e.g. a MemoryTransport)
390
            then InProcessTransport is raised.
391
        """
392
        raise NotImplementedError(self.external_url)
393
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
394
    def _pump(self, from_file, to_file):
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
395
        """Most children will need to copy from one file-like
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
396
        object or string to another one.
397
        This just gives them something easy to call.
398
        """
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
399
        return osutils.pumpfile(from_file, to_file)
1948.3.8 by Vincent LADEUIL
_pump accepts strings finally :)
400
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
401
    def _get_total(self, multi):
402
        """Try to figure out how many entries are in multi,
403
        but if not possible, return None.
404
        """
405
        try:
406
            return len(multi)
407
        except TypeError: # We can't tell how many, because relpaths is a generator
408
            return None
409
3882.7.1 by Martin Pool
Add stub _report_activity method as a transport callback
410
    def _report_activity(self, bytes, direction):
411
        """Notify that this transport has activity.
412
413
        Implementations should call this from all methods that actually do IO.
414
        Be careful that it's not called twice, if one method is implemented on
415
        top of another.
416
417
        :param bytes: Number of bytes read or written.
418
        :param direction: 'read' or 'write' or None.
419
        """
3882.7.5 by Martin Pool
Further mockup of transport-based activity indicator.
420
        ui.ui_factory.report_transport_activity(self, bytes, direction)
3882.7.1 by Martin Pool
Add stub _report_activity method as a transport callback
421
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
422
    def _update_pb(self, pb, msg, count, total):
423
        """Update the progress bar based on the current count
424
        and total available, total may be None if it was
425
        not possible to determine.
426
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
427
        if pb is None:
428
            return
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
429
        if total is None:
430
            pb.update(msg, count, count+1)
431
        else:
432
            pb.update(msg, count, total)
433
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
434
    def _iterate_over(self, multi, func, pb, msg, expand=True):
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
435
        """Iterate over all entries in multi, passing them to func,
436
        and update the progress bar as you go along.
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
437
438
        :param expand:  If True, the entries will be passed to the function
439
                        by expanding the tuple. If False, it will be passed
440
                        as a single parameter.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
441
        """
442
        total = self._get_total(multi)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
443
        result = []
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
444
        count = 0
445
        for entry in multi:
446
            self._update_pb(pb, msg, count, total)
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
447
            if expand:
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
448
                result.append(func(*entry))
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
449
            else:
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
450
                result.append(func(entry))
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
451
            count += 1
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
452
        return tuple(result)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
453
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
454
    def abspath(self, relpath):
455
        """Return the full url to the given relative path.
1910.16.6 by Andrew Bennetts
Update Transport.abspath docstring.
456
457
        :param relpath: a string of a relative path
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
458
        """
1442.1.44 by Robert Collins
Many transport related tweaks:
459
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
460
        # XXX: Robert Collins 20051016 - is this really needed in the public
461
        # interface ?
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
462
        raise NotImplementedError(self.abspath)
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
463
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
464
    def _combine_paths(self, base_path, relpath):
465
        """Transform a Transport-relative path to a remote absolute path.
466
467
        This does not handle substitution of ~ but does handle '..' and '.'
468
        components.
469
470
        Examples::
471
1996.3.20 by John Arbash Meinel
[merge] bzr.dev 2063
472
            t._combine_paths('/home/sarah', 'project/foo')
473
                => '/home/sarah/project/foo'
474
            t._combine_paths('/home/sarah', '../../etc')
475
                => '/etc'
2070.3.2 by Andrew Bennetts
Merge from bzr.dev
476
            t._combine_paths('/home/sarah', '/etc')
477
                => '/etc'
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
478
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
479
        :param base_path: urlencoded path for the transport root; typically a
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
480
             URL but need not contain scheme/host/etc.
481
        :param relpath: relative url string for relative part of remote path.
482
        :return: urlencoded string for final path.
483
        """
484
        if not isinstance(relpath, str):
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
485
            raise errors.InvalidURL(relpath)
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
486
        if relpath.startswith('/'):
487
            base_parts = []
488
        else:
489
            base_parts = base_path.split('/')
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
490
        if len(base_parts) > 0 and base_parts[-1] == '':
491
            base_parts = base_parts[:-1]
492
        for p in relpath.split('/'):
493
            if p == '..':
494
                if len(base_parts) == 0:
495
                    # In most filesystems, a request for the parent
496
                    # of root, just returns root.
497
                    continue
498
                base_parts.pop()
499
            elif p == '.':
500
                continue # No-op
501
            elif p != '':
502
                base_parts.append(p)
503
        path = '/'.join(base_parts)
2070.3.1 by Andrew Bennetts
Fix memory_transport.abspath('/foo')
504
        if not path.startswith('/'):
505
            path = '/' + path
1910.16.2 by Andrew Bennetts
Reduce transport code duplication by creating a '_combine_paths' method to Transport.
506
        return path
507
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
508
    def recommended_page_size(self):
509
        """Return the recommended page size for this transport.
510
511
        This is potentially different for every path in a given namespace.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
512
        For example, local transports might use an operating system call to
2671.3.1 by Robert Collins
* New method ``bzrlib.transport.Transport.get_recommended_page_size``.
513
        get the block size for a given path, which can vary due to mount
514
        points.
515
516
        :return: The page size in bytes.
517
        """
518
        return 4 * 1024
519
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
520
    def relpath(self, abspath):
521
        """Return the local path portion from a given absolute path.
1442.1.44 by Robert Collins
Many transport related tweaks:
522
523
        This default implementation is not suitable for filesystems with
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
524
        aliasing, such as that given by symlinks, where a path may not
525
        start with our base, but still be a relpath once aliasing is
1442.1.44 by Robert Collins
Many transport related tweaks:
526
        resolved.
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
527
        """
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
528
        # TODO: This might want to use bzrlib.osutils.relpath
529
        #       but we have to watch out because of the prefix issues
1530.1.3 by Robert Collins
transport implementations now tested consistently.
530
        if not (abspath == self.base[:-1] or abspath.startswith(self.base)):
1185.31.44 by John Arbash Meinel
Cleaned up Exceptions for all transports.
531
            raise errors.PathNotChild(abspath, self.base)
1442.1.44 by Robert Collins
Many transport related tweaks:
532
        pl = len(self.base)
1530.1.3 by Robert Collins
transport implementations now tested consistently.
533
        return abspath[pl:].strip('/')
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
534
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
535
    def local_abspath(self, relpath):
536
        """Return the absolute path on the local filesystem.
537
538
        This function will only be defined for Transports which have a
539
        physical local filesystem representation.
540
        """
2018.18.4 by Martin Pool
Change Transport.local_abspath to raise NotLocalUrl, and test.
541
        raise errors.NotLocalUrl(self.abspath(relpath))
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
542
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
543
    def has(self, relpath):
1442.1.44 by Robert Collins
Many transport related tweaks:
544
        """Does the file relpath exist?
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
545
1442.1.44 by Robert Collins
Many transport related tweaks:
546
        Note that some transports MAY allow querying on directories, but this
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
547
        is not part of the protocol.  In other words, the results of
1786.1.8 by John Arbash Meinel
[merge] Johan Rydberg test updates
548
        t.has("a_directory_name") are undefined.
1910.7.17 by Andrew Bennetts
Various cosmetic changes.
549
550
        :rtype: bool
1442.1.44 by Robert Collins
Many transport related tweaks:
551
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
552
        raise NotImplementedError(self.has)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
553
907.1.36 by John Arbash Meinel
Moving the multi-get functionality higher up into the Branch class.
554
    def has_multi(self, relpaths, pb=None):
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
555
        """Return True/False for each entry in relpaths"""
556
        total = self._get_total(relpaths)
557
        count = 0
558
        for relpath in relpaths:
907.1.36 by John Arbash Meinel
Moving the multi-get functionality higher up into the Branch class.
559
            self._update_pb(pb, 'has', count, total)
907.1.34 by John Arbash Meinel
Fixing append(), cleaning up function locations.
560
            yield self.has(relpath)
561
            count += 1
562
1185.16.155 by John Arbash Meinel
Added a has_any function to the Transport API
563
    def has_any(self, relpaths):
564
        """Return True if any of the paths exist."""
565
        for relpath in relpaths:
566
            if self.has(relpath):
567
                return True
568
        return False
569
1442.1.44 by Robert Collins
Many transport related tweaks:
570
    def iter_files_recursive(self):
571
        """Iter the relative paths of files in the transports sub-tree.
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
572
573
        *NOTE*: This only lists *files*, not subdirectories!
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
574
1442.1.44 by Robert Collins
Many transport related tweaks:
575
        As with other listing functions, only some transports implement this,.
3484.1.1 by Vincent Ladeuil
Trivial drive-by cleanups.
576
        you may check via listable() to determine if it will.
1442.1.44 by Robert Collins
Many transport related tweaks:
577
        """
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
578
        raise errors.TransportNotPossible("This transport has not "
1530.1.21 by Robert Collins
Review feedback fixes.
579
                                          "implemented iter_files_recursive "
1530.1.4 by Robert Collins
integrate Memory tests into transport interface tests.
580
                                          "(but must claim to be listable "
581
                                          "to trigger this error).")
1442.1.44 by Robert Collins
Many transport related tweaks:
582
2164.2.15 by Vincent Ladeuil
Http redirections are not followed by default. Do not use hints
583
    def get(self, relpath):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
584
        """Get the file at the given relative path.
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
585
2052.6.1 by Robert Collins
``Transport.get`` has had its interface made more clear for ease of use.
586
        This may fail in a number of ways:
587
         - HTTP servers may return content for a directory. (unexpected
588
           content failure)
589
         - FTP servers may indicate NoSuchFile for a directory.
590
         - SFTP servers may give a file handle for a directory that will
591
           fail on read().
592
593
        For correct use of the interface, be sure to catch errors.PathError
594
        when calling it and catch errors.ReadError when reading from the
595
        returned object.
596
907.1.20 by John Arbash Meinel
Removed Transport.open(), making get + put encode/decode to utf-8
597
        :param relpath: The relative path to the file
1910.19.2 by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow
598
        :rtype: File-like object.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
599
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
600
        raise NotImplementedError(self.get)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
601
1955.3.3 by John Arbash Meinel
Implement and test 'get_bytes'
602
    def get_bytes(self, relpath):
603
        """Get a raw string of the bytes for a file at the given location.
604
605
        :param relpath: The relative path to the file
606
        """
3882.7.3 by Martin Pool
transport.get should specifically close the file handle
607
        f = self.get(relpath)
608
        try:
609
            return f.read()
610
        finally:
611
            f.close()
1910.19.2 by Andrew Bennetts
Add a new method ``Transport.get_smart_client()``. This is provided to allow
612
2018.2.3 by Andrew Bennetts
Starting factoring out the smart server client "medium" from the protocol.
613
    def get_smart_medium(self):
614
        """Return a smart client medium for this transport if possible.
615
616
        A smart medium doesn't imply the presence of a smart server: it implies
617
        that the smart protocol can be tunnelled via this transport.
618
619
        :raises NoSmartMedium: if no smart server medium is available.
620
        """
621
        raise errors.NoSmartMedium(self)
622
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
623
    def readv(self, relpath, offsets, adjust_for_latency=False,
624
        upper_limit=None):
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
625
        """Get parts of the file at the given relative path.
626
627
        :param relpath: The path to read data from.
628
        :param offsets: A list of (offset, size) tuples.
3024.2.1 by Vincent Ladeuil
Fix 165061 by using the correct _max_readv_combine attribute.
629
        :param adjust_for_latency: Adjust the requested offsets to accomodate
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
630
            transport latency. This may re-order the offsets, expand them to
631
            grab adjacent data when there is likely a high cost to requesting
632
            data relative to delivering it.
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
633
        :param upper_limit: When adjust_for_latency is True setting upper_limit
634
            allows the caller to tell the transport about the length of the
635
            file, so that requests are not issued for ranges beyond the end of
636
            the file. This matters because some servers and/or transports error
637
            in such a case rather than just satisfying the available ranges.
638
            upper_limit should always be provided when adjust_for_latency is
639
            True, and should be the size of the file in bytes.
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
640
        :return: A list or generator of (offset, data) tuples
641
        """
642
        if adjust_for_latency:
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
643
            # Design note: We may wish to have different algorithms for the
644
            # expansion of the offsets per-transport. E.g. for local disk to
3024.2.1 by Vincent Ladeuil
Fix 165061 by using the correct _max_readv_combine attribute.
645
            # use page-aligned expansion. If that is the case consider the
646
            # following structure:
647
            #  - a test that transport.readv uses self._offset_expander or some
648
            #    similar attribute, to do the expansion
649
            #  - a test for each transport that it has some known-good offset
650
            #    expander
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
651
            #  - unit tests for each offset expander
652
            #  - a set of tests for the offset expander interface, giving
653
            #    baseline behaviour (which the current transport
654
            #    adjust_for_latency tests could be repurposed to).
655
            offsets = self._sort_expand_and_combine(offsets, upper_limit)
2745.5.1 by Robert Collins
* New parameter on ``bzrlib.transport.Transport.readv``
656
        return self._readv(relpath, offsets)
657
658
    def _readv(self, relpath, offsets):
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
659
        """Get parts of the file at the given relative path.
660
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
661
        :param relpath: The path to read.
662
        :param offsets: A list of (offset, size) tuples.
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
663
        :return: A list or generator of (offset, data) tuples
664
        """
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
665
        if not offsets:
1594.2.16 by Robert Collins
Coalesce readv requests on file based transports.
666
            return
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
667
1864.5.7 by John Arbash Meinel
remove disable prefetch support
668
        fp = self.get(relpath)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
669
        return self._seek_and_read(fp, offsets, relpath)
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
670
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
671
    def _seek_and_read(self, fp, offsets, relpath='<unknown>'):
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
672
        """An implementation of readv that uses fp.seek and fp.read.
673
674
        This uses _coalesce_offsets to issue larger reads and fewer seeks.
675
676
        :param fp: A file-like object that supports seek() and read(size)
677
        :param offsets: A list of offsets to be read from the given file.
678
        :return: yield (pos, data) tuples for each request
679
        """
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
680
        # We are going to iterate multiple times, we need a list
681
        offsets = list(offsets)
682
        sorted_offsets = sorted(offsets)
683
684
        # turn the list of offsets into a stack
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
685
        offset_stack = iter(offsets)
686
        cur_offset_and_size = offset_stack.next()
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
687
        coalesced = self._coalesce_offsets(sorted_offsets,
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
688
                               limit=self._max_readv_combine,
689
                               fudge_factor=self._bytes_to_read_before_seek)
1864.5.2 by John Arbash Meinel
always read in sorted order, and return in requested order, but only cache what is currently out of order
690
691
        # Cache the results, but only until they have been fulfilled
692
        data_map = {}
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
693
        for c_offset in coalesced:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
694
            # TODO: jam 20060724 it might be faster to not issue seek if
1864.5.11 by John Arbash Meinel
Factor out the workhorse of Transport.readv() into a helper function, and re-use that function in sftp but with a non-prefetch file.
695
            #       we are already at the right location. This should be
696
            #       benchmarked.
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
697
            fp.seek(c_offset.start)
698
            data = fp.read(c_offset.length)
2001.3.2 by John Arbash Meinel
Force all transports to raise ShortReadvError if they can
699
            if len(data) < c_offset.length:
700
                raise errors.ShortReadvError(relpath, c_offset.start,
2001.3.3 by John Arbash Meinel
review feedback: add the actual count written to ShortReadvError
701
                            c_offset.length, actual=len(data))
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
702
            for suboffset, subsize in c_offset.ranges:
703
                key = (c_offset.start+suboffset, subsize)
704
                data_map[key] = data[suboffset:suboffset+subsize]
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
705
1864.5.8 by John Arbash Meinel
Cleanup and NEWS
706
            # Now that we've read some data, see if we can yield anything back
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
707
            while cur_offset_and_size in data_map:
708
                this_data = data_map.pop(cur_offset_and_size)
3794.2.2 by John Arbash Meinel
Instead of counting the remaining offsets, trap the offset exception
709
                this_offset = cur_offset_and_size[0]
710
                try:
711
                    cur_offset_and_size = offset_stack.next()
712
                except StopIteration:
713
                    # Close the file handle as there will be no more data
714
                    # The handle would normally be cleaned up as this code goes
715
                    # out of scope, but as we are a generator, not all code
716
                    # will re-enter once we have consumed all the expected
717
                    # data. For example:
718
                    #   zip(range(len(requests)), readv(foo, requests))
719
                    # Will stop because the range is done, and not run the
720
                    # cleanup code for the readv().
721
                    fp.close()
722
                    cur_offset_and_size = None
723
                yield this_offset, this_data
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
724
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
725
    def _sort_expand_and_combine(self, offsets, upper_limit):
726
        """Helper for readv.
727
728
        :param offsets: A readv vector - (offset, length) tuples.
729
        :param upper_limit: The highest byte offset that may be requested.
730
        :return: A readv vector that will read all the regions requested by
731
            offsets, in start-to-end order, with no duplicated regions,
732
            expanded by the transports recommended page size.
733
        """
734
        offsets = sorted(offsets)
735
        # short circuit empty requests
736
        if len(offsets) == 0:
737
            def empty_yielder():
738
                # Quick thunk to stop this function becoming a generator
739
                # itself, rather we return a generator that has nothing to
740
                # yield.
741
                if False:
742
                    yield None
743
            return empty_yielder()
744
        # expand by page size at either end
745
        maximum_expansion = self.recommended_page_size()
746
        new_offsets = []
747
        for offset, length in offsets:
748
            expansion = maximum_expansion - length
749
            if expansion < 0:
750
                # we're asking for more than the minimum read anyway.
751
                expansion = 0
752
            reduction = expansion / 2
753
            new_offset = offset - reduction
754
            new_length = length + expansion
755
            if new_offset < 0:
756
                # don't ask for anything < 0
757
                new_offset = 0
758
            if (upper_limit is not None and
759
                new_offset + new_length > upper_limit):
760
                new_length = upper_limit - new_offset
761
            new_offsets.append((new_offset, new_length))
762
        # combine the expanded offsets
763
        offsets = []
764
        current_offset, current_length = new_offsets[0]
765
        current_finish = current_length + current_offset
766
        for offset, length in new_offsets[1:]:
767
            finish = offset + length
3805.4.2 by John Arbash Meinel
Revert the changes to _sort_expand_and_combine
768
            if offset > current_finish:
769
                # there is a gap, output the current accumulator and start
770
                # a new one for the region we're examining.
2890.1.3 by Robert Collins
Review feedback and discussion with Martin - split out the readv offset adjustment into a new helper and document where the design might/should go next.
771
                offsets.append((current_offset, current_length))
772
                current_offset = offset
773
                current_length = length
774
                current_finish = finish
775
                continue
776
            if finish > current_finish:
777
                # extend the current accumulator to the end of the region
778
                # we're examining.
779
                current_finish = finish
780
                current_length = finish - current_offset
781
        offsets.append((current_offset, current_length))
782
        return offsets
783
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
784
    @staticmethod
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
785
    def _coalesce_offsets(offsets, limit=0, fudge_factor=0, max_size=0):
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
786
        """Yield coalesced offsets.
787
788
        With a long list of neighboring requests, combine them
789
        into a single large request, while retaining the original
790
        offsets.
791
        Turns  [(15, 10), (25, 10)] => [(15, 20, [(0, 10), (10, 10)])]
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
792
        Note that overlapping requests are not permitted. (So [(15, 10), (20,
793
        10)] will raise a ValueError.) This is because the data we access never
794
        overlaps, and it allows callers to trust that we only need any byte of
795
        data for 1 request (so nothing needs to be buffered to fulfill a second
796
        request.)
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
797
798
        :param offsets: A list of (start, length) pairs
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
799
        :param limit: Only combine a maximum of this many pairs Some transports
800
                penalize multiple reads more than others, and sometimes it is
801
                better to return early.
802
                0 means no limit
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
803
        :param fudge_factor: All transports have some level of 'it is
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
804
                better to read some more data and throw it away rather
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
805
                than seek', so collapse if we are 'close enough'
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
806
        :param max_size: Create coalesced offsets no bigger than this size.
807
                When a single offset is bigger than 'max_size', it will keep
808
                its size and be alone in the coalesced offset.
809
                0 means no maximum size.
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
810
        :return: return a list of _CoalescedOffset objects, which have members
811
            for where to start, how much to read, and how to split those chunks
812
            back up
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
813
        """
814
        last_end = None
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
815
        cur = _CoalescedOffset(None, None, [])
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
816
        coalesced_offsets = []
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
817
3876.1.1 by John Arbash Meinel
Fix bug #303538 by capping the max per-hunk read size at 100MB.
818
        if max_size <= 0:
819
            # 'unlimited', but we actually take this to mean 100MB buffer limit
820
            max_size = 100*1024*1024
821
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
822
        for start, size in offsets:
823
            end = start + size
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
824
            if (last_end is not None
1864.5.3 by John Arbash Meinel
Allow collapsing ranges even if they are just 'close'
825
                and start <= last_end + fudge_factor
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
826
                and start >= cur.start
3059.2.17 by Vincent Ladeuil
Limit GET requests by body size instead of number of ranges.
827
                and (limit <= 0 or len(cur.ranges) < limit)
828
                and (max_size <= 0 or end - cur.start <= max_size)):
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
829
                if start < last_end:
3686.1.9 by John Arbash Meinel
Overlapping ranges are not allowed anymore.
830
                    raise ValueError('Overlapping range not allowed:'
3686.1.6 by John Arbash Meinel
Respond to Martin's review comments.
831
                        ' last range ended at %s, new one starts at %s'
832
                        % (last_end, start))
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
833
                cur.length = end - cur.start
834
                cur.ranges.append((start-cur.start, size))
1594.2.16 by Robert Collins
Coalesce readv requests on file based transports.
835
            else:
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
836
                if cur.start is not None:
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
837
                    coalesced_offsets.append(cur)
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
838
                cur = _CoalescedOffset(start, size, [(0, size)])
1864.5.1 by John Arbash Meinel
Change the readv combining algorithm for one that is easier to test.
839
            last_end = end
840
1864.5.9 by John Arbash Meinel
Switch to returning an object to make the api more understandable.
841
        if cur.start is not None:
3120.2.1 by John Arbash Meinel
Change the sftp_readv loop to buffer even less.
842
            coalesced_offsets.append(cur)
843
        return coalesced_offsets
1594.2.5 by Robert Collins
Readv patch from Johan Rydberg giving knits partial download support.
844
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
845
    def get_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
846
        """Get a list of file-like objects, one for each entry in relpaths.
847
848
        :param relpaths: A list of relative paths.
4463.1.1 by Martin Pool
Update docstrings for recent progress changes
849
        :param pb:  An optional ProgressTask for indicating percent done.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
850
        :return: A list or generator of file-like objects
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
851
        """
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
852
        # TODO: Consider having this actually buffer the requests,
853
        # in the default mode, it probably won't give worse performance,
854
        # and all children wouldn't have to implement buffering
907.1.16 by John Arbash Meinel
Fixing a few cut&paste typos.
855
        total = self._get_total(relpaths)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
856
        count = 0
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
857
        for relpath in relpaths:
907.1.16 by John Arbash Meinel
Fixing a few cut&paste typos.
858
            self._update_pb(pb, 'get', count, total)
907.1.50 by John Arbash Meinel
Removed encode/decode from Transport.put/get, added more exceptions that can be thrown.
859
            yield self.get(relpath)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
860
            count += 1
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
861
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
862
    def put_bytes(self, relpath, bytes, mode=None):
863
        """Atomically put the supplied bytes into the given location.
864
865
        :param relpath: The location to put the contents, relative to the
866
            transport base.
867
        :param bytes: A bytestring of data.
868
        :param mode: Create the file with the given mode.
869
        :return: None
870
        """
2414.1.3 by Andrew Bennetts
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
871
        if not isinstance(bytes, str):
872
            raise AssertionError(
873
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
874
        return self.put_file(relpath, StringIO(bytes), mode=mode)
875
876
    def put_bytes_non_atomic(self, relpath, bytes, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
877
                             create_parent_dir=False,
878
                             dir_mode=None):
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
879
        """Copy the string into the target location.
880
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
881
        This function is not strictly safe to use. See
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
882
        Transport.put_bytes_non_atomic for more information.
883
884
        :param relpath: The remote location to put the contents.
885
        :param bytes:   A string object containing the raw bytes to write into
886
                        the target file.
887
        :param mode:    Possible access permissions for new file.
888
                        None means do not set remote permissions.
889
        :param create_parent_dir: If we cannot create the target file because
890
                        the parent directory does not exist, go ahead and
891
                        create it, and then try again.
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
892
        :param dir_mode: Possible access permissions for new directories.
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
893
        """
2414.1.3 by Andrew Bennetts
Fix test failures under 'python2.4 -O' ('python2.5 -O' was already passing).
894
        if not isinstance(bytes, str):
895
            raise AssertionError(
896
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
897
        self.put_file_non_atomic(relpath, StringIO(bytes), mode=mode,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
898
                                 create_parent_dir=create_parent_dir,
899
                                 dir_mode=dir_mode)
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
900
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
901
    def put_file(self, relpath, f, mode=None):
902
        """Copy the file-like object into the location.
903
904
        :param relpath: Location to put the contents, relative to base.
905
        :param f:       File-like object.
906
        :param mode: The mode for the newly created file,
907
                     None means just use the default.
2745.5.2 by Robert Collins
* ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
908
        :return: The length of the file that was written.
1955.3.6 by John Arbash Meinel
Lots of deprecation warnings, but no errors
909
        """
910
        # We would like to mark this as NotImplemented, but most likely
911
        # transports have defined it in terms of the old api.
912
        symbol_versioning.warn('Transport %s should implement put_file,'
913
                               ' rather than implementing put() as of'
914
                               ' version 0.11.'
915
                               % (self.__class__.__name__,),
916
                               DeprecationWarning)
917
        return self.put(relpath, f, mode=mode)
918
        #raise NotImplementedError(self.put_file)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
919
1955.3.27 by John Arbash Meinel
rename non_atomic_put_* to put_*non_atomic, and re-order the functions
920
    def put_file_non_atomic(self, relpath, f, mode=None,
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
921
                            create_parent_dir=False,
922
                            dir_mode=None):
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
923
        """Copy the file-like object into the target location.
924
925
        This function is not strictly safe to use. It is only meant to
926
        be used when you already know that the target does not exist.
927
        It is not safe, because it will open and truncate the remote
928
        file. So there may be a time when the file has invalid contents.
929
930
        :param relpath: The remote location to put the contents.
931
        :param f:       File-like object.
932
        :param mode:    Possible access permissions for new file.
933
                        None means do not set remote permissions.
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
934
        :param create_parent_dir: If we cannot create the target file because
935
                        the parent directory does not exist, go ahead and
936
                        create it, and then try again.
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
937
        :param dir_mode: Possible access permissions for new directories.
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
938
        """
939
        # Default implementation just does an atomic put.
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
940
        try:
1955.3.19 by John Arbash Meinel
rename non_atomic_put => non_atomic_put_file
941
            return self.put_file(relpath, f, mode=mode)
1946.1.8 by John Arbash Meinel
Update non_atomic_put to have a create_parent_dir flag
942
        except errors.NoSuchFile:
943
            if not create_parent_dir:
944
                raise
945
            parent_dir = osutils.dirname(relpath)
946
            if parent_dir:
1946.2.12 by John Arbash Meinel
Add ability to pass a directory mode to non_atomic_put
947
                self.mkdir(parent_dir, mode=dir_mode)
1955.3.19 by John Arbash Meinel
rename non_atomic_put => non_atomic_put_file
948
                return self.put_file(relpath, f, mode=mode)
1946.1.1 by John Arbash Meinel
Stub out the test and basic implementation for 'non_atomic_put'
949
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
950
    def mkdir(self, relpath, mode=None):
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
951
        """Create a directory at the given path."""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
952
        raise NotImplementedError(self.mkdir)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
953
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
954
    def mkdir_multi(self, relpaths, mode=None, pb=None):
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
955
        """Create a group of directories"""
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
956
        def mkdir(path):
957
            self.mkdir(path, mode=mode)
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
958
        return len(self._iterate_over(relpaths, mkdir, pb, 'mkdir', expand=False))
907.1.47 by John Arbash Meinel
Created mkdir_multi, modified branch to use _multi forms when initializing a branch, creating a full test routine for transports
959
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
960
    def open_write_stream(self, relpath, mode=None):
961
        """Open a writable file stream at relpath.
2671.3.2 by Robert Collins
Start open_file_stream logic.
962
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
963
        A file stream is a file like object with a write() method that accepts
964
        bytes to write.. Buffering may occur internally until the stream is
965
        closed with stream.close().  Calls to readv or the get_* methods will
966
        be synchronised with any internal buffering that may be present.
2671.3.2 by Robert Collins
Start open_file_stream logic.
967
968
        :param relpath: The relative path to the file.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
969
        :param mode: The mode for the newly created file,
2671.3.3 by Robert Collins
Add mode parameter to Transport.open_file_stream.
970
                     None means just use the default
2671.3.6 by Robert Collins
Review feedback.
971
        :return: A FileStream. FileStream objects have two methods, write() and
972
            close(). There is no guarantee that data is committed to the file
973
            if close() has not been called (even if get() is called on the same
974
            path).
2671.3.2 by Robert Collins
Start open_file_stream logic.
975
        """
2671.3.9 by Robert Collins
Review feedback and fix VFat emulated transports to not claim to have unix permissions.
976
        raise NotImplementedError(self.open_write_stream)
2671.3.2 by Robert Collins
Start open_file_stream logic.
977
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
978
    def append_file(self, relpath, f, mode=None):
1910.7.18 by Andrew Bennetts
Merge from bzr.dev
979
        """Append bytes from a file-like object to a file at relpath.
980
981
        The file is created if it does not already exist.
982
983
        :param f: a file-like object of the bytes to append.
984
        :param mode: Unix mode for newly created files.  This is not used for
985
            existing files.
986
987
        :returns: the length of relpath before the content was written to it.
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
988
        """
989
        symbol_versioning.warn('Transport %s should implement append_file,'
990
                               ' rather than implementing append() as of'
991
                               ' version 0.11.'
992
                               % (self.__class__.__name__,),
993
                               DeprecationWarning)
994
        return self.append(relpath, f, mode=mode)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
995
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
996
    def append_bytes(self, relpath, bytes, mode=None):
1910.7.18 by Andrew Bennetts
Merge from bzr.dev
997
        """Append bytes to a file at relpath.
998
999
        The file is created if it does not already exist.
1000
1001
        :type f: str
1002
        :param f: a string of the bytes to append.
1003
        :param mode: Unix mode for newly created files.  This is not used for
1004
            existing files.
1005
1006
        :returns: the length of relpath before the content was written to it.
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
1007
        """
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1008
        if not isinstance(bytes, str):
1009
            raise TypeError(
1010
                'bytes must be a plain string, not %s' % type(bytes))
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
1011
        return self.append_file(relpath, StringIO(bytes), mode=mode)
1955.3.2 by John Arbash Meinel
Implement and test 'Transport.append_bytes', cleanup the tests of plain append
1012
1185.11.19 by John Arbash Meinel
Testing put and append, also testing agaist file-like objects as well as strings.
1013
    def append_multi(self, files, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1014
        """Append the text in each file-like or string object to
1015
        the supplied location.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1016
1017
        :param files: A set of (path, f) entries
4463.1.1 by Martin Pool
Update docstrings for recent progress changes
1018
        :param pb:  An optional ProgressTask for indicating percent done.
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1019
        """
1955.3.15 by John Arbash Meinel
Deprecate 'Transport.append' in favor of Transport.append_file or Transport.append_bytes
1020
        return self._iterate_over(files, self.append_file, pb, 'append', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1021
1022
    def copy(self, rel_from, rel_to):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1023
        """Copy the item at rel_from to the location at rel_to.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1024
1025
        Override this for efficiency if a specific transport can do it
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1026
        faster than this default implementation.
1027
        """
1955.3.11 by John Arbash Meinel
Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
1028
        self.put_file(rel_to, self.get(rel_from))
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1029
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1030
    def copy_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1031
        """Copy a bunch of entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1032
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1033
        :param relpaths: A list of tuples of the form [(from, to), (from, to),...]
1034
        """
1035
        # This is the non-pipelined implementation, so that
1036
        # implementors don't have to implement everything.
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1037
        return self._iterate_over(relpaths, self.copy, pb, 'copy', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1038
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
1039
    def copy_to(self, relpaths, other, mode=None, pb=None):
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1040
        """Copy a set of entries from self into another Transport.
1041
1042
        :param relpaths: A list/generator of entries to be copied.
1185.58.2 by John Arbash Meinel
Added mode to the appropriate transport functions, and tests to make sure they work.
1043
        :param mode: This is the target mode for the newly created files
1185.16.156 by John Arbash Meinel
Adding a note about changing copy_to's interface
1044
        TODO: This interface needs to be updated so that the target location
1045
              can be different from the source location.
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1046
        """
1047
        # The dummy implementation just does a simple get + put
1048
        def copy_entry(path):
1955.3.11 by John Arbash Meinel
Clean up the rest of the api calls to deprecated functions in the test suite, and make sure Transport._pump is only accepting files, not strings
1049
            other.put_file(path, self.get(path), mode=mode)
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1050
1563.2.3 by Robert Collins
Change the return signature of transport.append and append_multi to return the length of the pre-append content.
1051
        return len(self._iterate_over(relpaths, copy_entry, pb, 'copy_to', expand=False))
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1052
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1053
    def copy_tree(self, from_relpath, to_relpath):
1054
        """Copy a subtree from one relpath to another.
1055
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1056
        If a faster implementation is available, specific transports should
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1057
        implement it.
1058
        """
1059
        source = self.clone(from_relpath)
1060
        target = self.clone(to_relpath)
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1061
        target.mkdir('.')
1062
        source.copy_tree_to_transport(target)
1063
1064
    def copy_tree_to_transport(self, to_transport):
1065
        """Copy a subtree from one transport to another.
1066
1067
        self.base is used as the source tree root, and to_transport.base
1068
        is used as the target.  to_transport.base must exist (and be a
1069
        directory).
1070
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1071
        files = []
1072
        directories = ['.']
1073
        while directories:
1074
            dir = directories.pop()
1075
            if dir != '.':
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1076
                to_transport.mkdir(dir)
1077
            for path in self.list_dir(dir):
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1078
                path = dir + '/' + path
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1079
                stat = self.stat(path)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1080
                if S_ISDIR(stat.st_mode):
1081
                    directories.append(path)
1082
                else:
1083
                    files.append(path)
1551.21.5 by Aaron Bentley
Implement copy_tree on copy_tree_to_transport
1084
        self.copy_to(files, to_transport)
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1085
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1086
    def rename(self, rel_from, rel_to):
1087
        """Rename a file or directory.
1088
1089
        This *must* fail if the destination is a nonempty directory - it must
1090
        not automatically remove it.  It should raise DirectoryNotEmpty, or
1091
        some other PathError if the case can't be specifically detected.
1092
1093
        If the destination is an empty directory or a file this function may
1094
        either fail or succeed, depending on the underlying transport.  It
1095
        should not attempt to remove the destination if overwriting is not the
1096
        native transport behaviour.  If at all possible the transport should
1097
        ensure that the rename either completes or not, without leaving the
1098
        destination deleted and the new file not moved in place.
1099
1100
        This is intended mainly for use in implementing LockDir.
1101
        """
1102
        # transports may need to override this
1553.5.17 by Martin Pool
Transport.rename should be unimplemented in base class
1103
        raise NotImplementedError(self.rename)
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1104
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1105
    def move(self, rel_from, rel_to):
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1106
        """Move the item at rel_from to the location at rel_to.
1553.5.13 by Martin Pool
New Transport.rename that mustn't overwrite
1107
1108
        The destination is deleted if possible, even if it's a non-empty
1109
        directory tree.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1110
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1111
        If a transport can directly implement this it is suggested that
1112
        it do so for efficiency.
1113
        """
1534.4.26 by Robert Collins
Move working tree initialisation out from Branch.initialize, deprecated Branch.initialize to Branch.create.
1114
        if S_ISDIR(self.stat(rel_from).st_mode):
1115
            self.copy_tree(rel_from, rel_to)
1116
            self.delete_tree(rel_from)
1117
        else:
1118
            self.copy(rel_from, rel_to)
1119
            self.delete(rel_from)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1120
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1121
    def move_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1122
        """Move a bunch of entries.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1123
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1124
        :param relpaths: A list of tuples of the form [(from1, to1), (from2, to2),...]
1125
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1126
        return self._iterate_over(relpaths, self.move, pb, 'move', expand=True)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1127
1128
    def move_multi_to(self, relpaths, rel_to):
1129
        """Move a bunch of entries to a single location.
1130
        This differs from move_multi in that you give a list of from, and
1131
        a single destination, rather than multiple destinations.
1132
1133
        :param relpaths: A list of relative paths [from1, from2, from3, ...]
1134
        :param rel_to: A directory where each entry should be placed.
1135
        """
1136
        # This is not implemented, because you need to do special tricks to
1137
        # extract the basename, and add it to rel_to
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1138
        raise NotImplementedError(self.move_multi_to)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1139
1140
    def delete(self, relpath):
1141
        """Delete the item at relpath"""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1142
        raise NotImplementedError(self.delete)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1143
907.1.28 by John Arbash Meinel
Added pb to function that were missing, implemented a basic double-dispatch copy_to function.
1144
    def delete_multi(self, relpaths, pb=None):
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1145
        """Queue up a bunch of deletes to be done.
1146
        """
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1147
        return self._iterate_over(relpaths, self.delete, pb, 'delete', expand=False)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1148
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
1149
    def delete_tree(self, relpath):
1150
        """Delete an entire tree. This may require a listable transport."""
1151
        subtree = self.clone(relpath)
1152
        files = []
1153
        directories = ['.']
1154
        pending_rmdirs = []
1155
        while directories:
1156
            dir = directories.pop()
1157
            if dir != '.':
1158
                pending_rmdirs.append(dir)
1159
            for path in subtree.list_dir(dir):
1160
                path = dir + '/' + path
1161
                stat = subtree.stat(path)
1162
                if S_ISDIR(stat.st_mode):
1163
                    directories.append(path)
1164
                else:
1165
                    files.append(path)
1166
        subtree.delete_multi(files)
1167
        pending_rmdirs.reverse()
1168
        for dir in pending_rmdirs:
1169
            subtree.rmdir(dir)
1170
        self.rmdir(relpath)
1171
1534.5.7 by Robert Collins
Start factoring out the upgrade policy logic.
1172
    def __repr__(self):
1173
        return "<%s.%s url=%s>" % (self.__module__, self.__class__.__name__, self.base)
1174
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1175
    def stat(self, relpath):
1176
        """Return the stat information for a file.
1177
        WARNING: This may not be implementable for all protocols, so use
1178
        sparingly.
1442.1.44 by Robert Collins
Many transport related tweaks:
1179
        NOTE: This returns an object with fields such as 'st_size'. It MAY
1180
        or MAY NOT return the literal result of an os.stat() call, so all
1181
        access should be via named fields.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1182
        ALSO NOTE: Stats of directories may not be supported on some
1442.1.44 by Robert Collins
Many transport related tweaks:
1183
        transports.
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1184
        """
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1185
        raise NotImplementedError(self.stat)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1186
1534.4.15 by Robert Collins
Remove shutil dependency in upgrade - create a delete_tree method for transports.
1187
    def rmdir(self, relpath):
1188
        """Remove a directory at the given path."""
1189
        raise NotImplementedError
1190
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1191
    def stat_multi(self, relpaths, pb=None):
1192
        """Stat multiple files and return the information.
1193
        """
1194
        #TODO:  Is it worth making this a generator instead of a
1195
        #       returning a list?
1196
        stats = []
1197
        def gather(path):
1198
            stats.append(self.stat(path))
1199
907.1.14 by John Arbash Meinel
Handling some transport functions which take only a single argument.
1200
        count = self._iterate_over(relpaths, gather, pb, 'stat', expand=False)
907.1.2 by John Arbash Meinel
Working on making Branch() do all of it's work over a Transport.
1201
        return stats
1202
1400.1.1 by Robert Collins
implement a basic test for the ui branch command from http servers
1203
    def listable(self):
1204
        """Return True if this store supports listing."""
1540.3.1 by Martin Pool
First-cut implementation of pycurl. Substantially faster than using urllib.
1205
        raise NotImplementedError(self.listable)
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1206
1207
    def list_dir(self, relpath):
1208
        """Return a list of all files at the given location.
1209
        WARNING: many transports do not support this, so trying avoid using
1210
        it if at all possible.
1211
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1212
        raise errors.TransportNotPossible("Transport %r has not "
1530.1.21 by Robert Collins
Review feedback fixes.
1213
                                          "implemented list_dir "
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1214
                                          "(but must claim to be listable "
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1215
                                          "to trigger this error)."
1216
                                          % (self))
907.1.1 by John Arbash Meinel
Reworking the Branch and Store code to support an abstracted filesystem layer.
1217
907.1.24 by John Arbash Meinel
Remote functionality work.
1218
    def lock_read(self, relpath):
1219
        """Lock the given file for shared (read) access.
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1220
1221
        WARNING: many transports do not support this, so trying avoid using it.
1222
        These methods may be removed in the future.
1223
1224
        Transports may raise TransportNotPossible if OS-level locks cannot be
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1225
        taken over this transport.
907.1.24 by John Arbash Meinel
Remote functionality work.
1226
1227
        :return: A lock object, which should contain an unlock() function.
1228
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1229
        raise errors.TransportNotPossible("transport locks not supported on %s" % self)
907.1.24 by John Arbash Meinel
Remote functionality work.
1230
1231
    def lock_write(self, relpath):
1232
        """Lock the given file for exclusive (write) access.
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1233
1234
        WARNING: many transports do not support this, so trying avoid using it.
1235
        These methods may be removed in the future.
1236
1237
        Transports may raise TransportNotPossible if OS-level locks cannot be
1238
        taken over this transport.
907.1.24 by John Arbash Meinel
Remote functionality work.
1239
1240
        :return: A lock object, which should contain an unlock() function.
1241
        """
1910.16.1 by Andrew Bennetts
lock_read and lock_write may raise TransportNotPossible.
1242
        raise errors.TransportNotPossible("transport locks not supported on %s" % self)
907.1.24 by John Arbash Meinel
Remote functionality work.
1243
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1244
    def is_readonly(self):
1245
        """Return true if this connection cannot be written to."""
1246
        return False
1247
1608.2.7 by Martin Pool
Rename supports_unix_modebits to _can_roundtrip_unix_modebits for clarity
1248
    def _can_roundtrip_unix_modebits(self):
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1249
        """Return true if this transport can store and retrieve unix modebits.
1250
1251
        (For example, 0700 to make a directory owner-private.)
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1252
1253
        Note: most callers will not want to switch on this, but should rather
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1254
        just try and set permissions and let them be either stored or not.
1255
        This is intended mainly for the use of the test suite.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1256
1257
        Warning: this is not guaranteed to be accurate as sometimes we can't
1608.2.5 by Martin Pool
Add Transport.supports_unix_modebits, so tests can
1258
        be sure: for example with vfat mounted on unix, or a windows sftp
1259
        server."""
1260
        # TODO: Perhaps return a e.g. TransportCharacteristics that can answer
1261
        # several questions about the transport.
1262
        return False
1263
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1264
    def _reuse_for(self, other_base):
2485.8.43 by Vincent Ladeuil
Cleaning.
1265
        # This is really needed for ConnectedTransport only, but it's easier to
1266
        # have Transport refuses to be reused than testing that the reuse
1267
        # should be asked to ConnectedTransport only.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1268
        return None
907.1.24 by John Arbash Meinel
Remote functionality work.
1269
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
1270
    def _redirected_to(self, source, target):
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1271
        """Returns a transport suitable to re-issue a redirected request.
1272
3878.4.5 by Vincent Ladeuil
Don't use the exception as a parameter for _redirected_to.
1273
        :param source: The source url as returned by the server.
1274
        :param target: The target url as returned by the server.
3878.4.1 by Vincent Ladeuil
Fix bug #245964 by preserving decorators during redirections (when
1275
1276
        The redirection can be handled only if the relpath involved is not
1277
        renamed by the redirection.
1278
1279
        :returns: A transport or None.
1280
        """
1281
        # This returns None by default, meaning the transport can't handle the
1282
        # redirection.
1283
        return None
1284
1285
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1286
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1287
class _SharedConnection(object):
1288
    """A connection shared between several transports."""
1289
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
1290
    def __init__(self, connection=None, credentials=None, base=None):
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1291
        """Constructor.
1292
1293
        :param connection: An opaque object specific to each transport.
1294
1295
        :param credentials: An opaque object containing the credentials used to
1296
            create the connection.
1297
        """
1298
        self.connection = connection
1299
        self.credentials = credentials
3104.4.1 by Andrew Bennetts
Fix paths sent by bzr+http client to correctly adjust for shared medium.
1300
        self.base = base
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1301
1302
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1303
class ConnectedTransport(Transport):
1304
    """A transport connected to a remote server.
1305
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1306
    This class provide the basis to implement transports that need to connect
1307
    to a remote server.
1308
1309
    Host and credentials are available as private attributes, cloning preserves
1310
    them and share the underlying, protocol specific, connection.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1311
    """
1312
2485.8.59 by Vincent Ladeuil
Update from review comments.
1313
    def __init__(self, base, _from_transport=None):
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1314
        """Constructor.
1315
2485.8.62 by Vincent Ladeuil
From review comments, fix typos and deprecate some functions.
1316
        The caller should ensure that _from_transport points at the same host
1317
        as the new base.
1318
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1319
        :param base: transport root URL
1320
2485.8.59 by Vincent Ladeuil
Update from review comments.
1321
        :param _from_transport: optional transport to build from. The built
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1322
            transport will share the connection with this transport.
1323
        """
2485.8.59 by Vincent Ladeuil
Update from review comments.
1324
        if not base.endswith('/'):
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1325
            base += '/'
1326
        (self._scheme,
1327
         self._user, self._password,
1328
         self._host, self._port,
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1329
         self._path) = self._split_url(base)
2485.8.59 by Vincent Ladeuil
Update from review comments.
1330
        if _from_transport is not None:
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1331
            # Copy the password as it does not appear in base and will be lost
2485.8.59 by Vincent Ladeuil
Update from review comments.
1332
            # otherwise. It can appear in the _split_url above if the user
1333
            # provided it on the command line. Otherwise, daughter classes will
1334
            # prompt the user for one when appropriate.
1335
            self._password = _from_transport._password
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1336
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1337
        base = self._unsplit_url(self._scheme,
1338
                                 self._user, self._password,
1339
                                 self._host, self._port,
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1340
                                 self._path)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1341
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1342
        super(ConnectedTransport, self).__init__(base)
2485.8.59 by Vincent Ladeuil
Update from review comments.
1343
        if _from_transport is None:
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1344
            self._shared_connection = _SharedConnection()
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1345
        else:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1346
            self._shared_connection = _from_transport._shared_connection
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1347
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1348
    def clone(self, offset=None):
1349
        """Return a new transport with root at self.base + offset
1350
1351
        We leave the daughter classes take advantage of the hint
1352
        that it's a cloning not a raw creation.
1353
        """
1354
        if offset is None:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1355
            return self.__class__(self.base, _from_transport=self)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1356
        else:
2485.8.59 by Vincent Ladeuil
Update from review comments.
1357
            return self.__class__(self.abspath(offset), _from_transport=self)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1358
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1359
    @staticmethod
1360
    def _split_url(url):
3873.3.1 by Martin Pool
Move Transport._split_url to urlutils, and ad a simple test
1361
        return urlutils.parse_url(url)
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1362
2485.8.47 by Vincent Ladeuil
Remove _initial_split_url hack.
1363
    @staticmethod
1364
    def _unsplit_url(scheme, user, password, host, port, path):
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1365
        """
1366
        Build the full URL for the given already URL encoded path.
1367
1368
        user, password, host and path will be quoted if they contain reserved
1369
        chars.
1370
1371
        :param scheme: protocol
1372
1373
        :param user: login
1374
1375
        :param password: associated password
1376
1377
        :param host: the server address
1378
1379
        :param port: the associated port
1380
1381
        :param path: the absolute path on the server
1382
1383
        :return: The corresponding URL.
1384
        """
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1385
        netloc = urllib.quote(host)
1386
        if user is not None:
1387
            # Note that we don't put the password back even if we
1388
            # have one so that it doesn't get accidentally
1389
            # exposed.
1390
            netloc = '%s@%s' % (urllib.quote(user), netloc)
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1391
        if port is not None:
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1392
            netloc = '%s:%d' % (netloc, port)
4505.3.1 by Andy Kilner
Fix up another tilde bug.
1393
        path = urlutils.escape(path)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1394
        return urlparse.urlunparse((scheme, netloc, path, None, None, None))
1395
1396
    def relpath(self, abspath):
2485.8.29 by Vincent Ladeuil
Cometic changes (and a typo).
1397
        """Return the local path portion from a given absolute path"""
1398
        scheme, user, password, host, port, path = self._split_url(abspath)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1399
        error = []
1400
        if (scheme != self._scheme):
1401
            error.append('scheme mismatch')
1402
        if (user != self._user):
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1403
            error.append('user name mismatch')
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1404
        if (host != self._host):
1405
            error.append('host mismatch')
1406
        if (port != self._port):
1407
            error.append('port mismatch')
1408
        if not (path == self._path[:-1] or path.startswith(self._path)):
1409
            error.append('path mismatch')
1410
        if error:
1411
            extra = ', '.join(error)
1412
            raise errors.PathNotChild(abspath, self.base, extra=extra)
1413
        pl = len(self._path)
1414
        return path[pl:].strip('/')
1415
1416
    def abspath(self, relpath):
1417
        """Return the full url to the given relative path.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1418
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1419
        :param relpath: the relative path urlencoded
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1420
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1421
        :returns: the Unicode version of the absolute path for relpath.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1422
        """
2485.8.25 by Vincent Ladeuil
Separate abspath from _remote_path, the intents are different.
1423
        relative = urlutils.unescape(relpath).encode('utf-8')
1424
        path = self._combine_paths(self._path, relative)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1425
        return self._unsplit_url(self._scheme, self._user, self._password,
1426
                                 self._host, self._port,
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1427
                                 path)
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1428
1429
    def _remote_path(self, relpath):
1430
        """Return the absolute path part of the url to the given relative path.
2485.8.28 by Vincent Ladeuil
Further simplifications and doc updates.
1431
1432
        This is the path that the remote server expect to receive in the
1433
        requests, daughter classes should redefine this method if needed and
1434
        use the result to build their requests.
1435
1436
        :param relpath: the path relative to the transport base urlencoded.
1437
1438
        :return: the absolute Unicode path on the server,
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1439
        """
1440
        relative = urlutils.unescape(relpath).encode('utf-8')
1441
        remote_path = self._combine_paths(self._path, relative)
1442
        return remote_path
1443
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1444
    def _get_shared_connection(self):
1445
        """Get the object shared amongst cloned transports.
1446
1447
        This should be used only by classes that needs to extend the sharing
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1448
        with objects other than transports.
2485.8.54 by Vincent Ladeuil
Refactor medium uses by making a distinction betweem shared and real medium.
1449
1450
        Use _get_connection to get the connection itself.
1451
        """
1452
        return self._shared_connection
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1453
1454
    def _set_connection(self, connection, credentials=None):
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1455
        """Record a newly created connection with its associated credentials.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1456
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1457
        Note: To ensure that connection is still shared after a temporary
1458
        failure and a new one needs to be created, daughter classes should
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1459
        always call this method to set the connection and do so each time a new
1460
        connection is created.
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1461
1462
        :param connection: An opaque object representing the connection used by
1463
            the daughter class.
1464
1465
        :param credentials: An opaque object representing the credentials
1466
            needed to create the connection.
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1467
        """
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1468
        self._shared_connection.connection = connection
1469
        self._shared_connection.credentials = credentials
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1470
1471
    def _get_connection(self):
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1472
        """Returns the transport specific connection object."""
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1473
        return self._shared_connection.connection
2485.8.30 by Vincent Ladeuil
Implement reliable connection sharing.
1474
2485.8.32 by Vincent Ladeuil
Keep credentials used at connection creation for reconnection purposes.
1475
    def _get_credentials(self):
2485.8.34 by Vincent Ladeuil
Refactor mutiple connections detection and fix false positives. Only
1476
        """Returns the credentials used to establish the connection."""
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1477
        return self._shared_connection.credentials
2485.8.19 by Vincent Ladeuil
Add a new ConnectedTransport class refactored from [s]ftp and http.
1478
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1479
    def _update_credentials(self, credentials):
1480
        """Update the credentials of the current connection.
1481
1482
        Some protocols can renegociate the credentials within a connection,
1483
        this method allows daughter classes to share updated credentials.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1484
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1485
        :param credentials: the updated credentials.
1486
        """
1487
        # We don't want to call _set_connection here as we are only updating
1488
        # the credentials not creating a new connection.
2485.8.55 by Vincent Ladeuil
Cleanup connection accessors.
1489
        self._shared_connection.credentials = credentials
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1490
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1491
    def _reuse_for(self, other_base):
1492
        """Returns a transport sharing the same connection if possible.
1493
1494
        Note: we share the connection if the expected credentials are the
1495
        same: (host, port, user). Some protocols may disagree and redefine the
1496
        criteria in daughter classes.
1497
1498
        Note: we don't compare the passwords here because other_base may have
1499
        been obtained from an existing transport.base which do not mention the
1500
        password.
1501
1502
        :param other_base: the URL we want to share the connection with.
1503
1504
        :return: A new transport or None if the connection cannot be shared.
1505
        """
2990.2.2 by Vincent Ladeuil
Detect invalid transport reuse attempts by catching invalid URLs.
1506
        try:
1507
            (scheme, user, password,
1508
             host, port, path) = self._split_url(other_base)
1509
        except errors.InvalidURL:
1510
            # No hope in trying to reuse an existing transport for an invalid
1511
            # URL
1512
            return None
1513
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1514
        transport = None
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1515
        # Don't compare passwords, they may be absent from other_base or from
1516
        # self and they don't carry more information than user anyway.
2485.8.59 by Vincent Ladeuil
Update from review comments.
1517
        if (scheme == self._scheme
1518
            and user == self._user
1519
            and host == self._host
1520
            and port == self._port):
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1521
            if not path.endswith('/'):
1522
                # This normally occurs at __init__ time, but it's easier to do
2485.8.39 by Vincent Ladeuil
Add tests around connection reuse.
1523
                # it now to avoid creating two transports for the same base.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1524
                path += '/'
1525
            if self._path  == path:
1526
                # shortcut, it's really the same transport
1527
                return self
1528
            # We don't call clone here because the intent is different: we
1529
            # build a new transport on a different base (which may be totally
1530
            # unrelated) but we share the connection.
2485.8.59 by Vincent Ladeuil
Update from review comments.
1531
            transport = self.__class__(other_base, _from_transport=self)
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1532
        return transport
1533
1534
1535
# We try to recognize an url lazily (ignoring user, password, etc)
1536
_urlRE = re.compile(r'^(?P<proto>[^:/\\]+)://(?P<rest>.*)$')
1685.1.9 by John Arbash Meinel
Updated LocalTransport so that it's base is now a URL rather than a local path. This helps consistency with all other functions. To do so, I added local_abspath() which returns the local path, and local_path_to/from_url
1537
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1538
def get_transport(base, possible_transports=None):
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1539
    """Open a transport to access a URL or directory.
1540
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1541
    :param base: either a URL or a directory name.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1542
1543
    :param transports: optional reusable transports list. If not None, created
2485.8.59 by Vincent Ladeuil
Update from review comments.
1544
        transports will be added to the list.
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1545
1546
    :return: A new transport optionally sharing its connection with one of
2485.8.59 by Vincent Ladeuil
Update from review comments.
1547
        possible_transports.
1185.70.3 by Martin Pool
Various updates to make storage branch mergeable:
1548
    """
907.1.13 by John Arbash Meinel
Fixed bzr root.
1549
    if base is None:
1685.1.11 by John Arbash Meinel
Not all of the registered transports use :// as part of their path, specifically memory:/
1550
        base = '.'
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1551
    last_err = None
3251.3.1 by Aaron Bentley
Add support for directory services
1552
    from bzrlib.directory_service import directories
1553
    base = directories.dereference(base)
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1554
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1555
    def convert_path_to_url(base, error_str):
1556
        m = _urlRE.match(base)
1557
        if m:
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1558
            # This looks like a URL, but we weren't able to
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1559
            # instantiate it as such raise an appropriate error
2485.8.38 by Vincent Ladeuil
Finish sftp refactoring. Test suite passing.
1560
            # FIXME: we have a 'error_str' unused and we use last_err below
1843.1.1 by John Arbash Meinel
Update get_transport to raise a nicer error which includes dependency info
1561
            raise errors.UnsupportedProtocol(base, last_err)
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1562
        # This doesn't look like a protocol, consider it a local path
1685.1.45 by John Arbash Meinel
Moved url functions into bzrlib.urlutils
1563
        new_base = urlutils.local_path_to_url(base)
1908.3.1 by Carl Friedrich Bolz
Clean up some mutter() calls.
1564
        # mutter('converting os path %r => url %s', base, new_base)
1685.1.33 by John Arbash Meinel
Be more of a Nazi about URLs not being unicode
1565
        return new_base
1566
1567
    # Catch any URLs which are passing Unicode rather than ASCII
1568
    try:
1569
        base = base.encode('ascii')
1570
    except UnicodeError:
1571
        # Only local paths can be Unicode
1572
        base = convert_path_to_url(base,
1573
            'URLs must be properly escaped (protocol: %s)')
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1574
1575
    transport = None
1551.18.10 by Aaron Bentley
get_transport appends to possible_transports if it's an empty list
1576
    if possible_transports is not None:
2476.3.8 by Vincent Ladeuil
Mark transports that need to be instrumented or refactored to check
1577
        for t in possible_transports:
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1578
            t_same_connection = t._reuse_for(base)
1579
            if t_same_connection is not None:
1580
                # Add only new transports
1581
                if t_same_connection not in possible_transports:
1582
                    possible_transports.append(t_same_connection)
1583
                return t_same_connection
1584
3882.1.1 by Martin Pool
Don't call iteritems on transport_list_registry, because it may change during iteration
1585
    for proto, factory_list in transport_list_registry.items():
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1586
        if proto is not None and base.startswith(proto):
1587
            transport, last_err = _try_transport_factories(base, factory_list)
1588
            if transport:
1551.18.10 by Aaron Bentley
get_transport appends to possible_transports if it's an empty list
1589
                if possible_transports is not None:
3376.2.4 by Martin Pool
Remove every assert statement from bzrlib!
1590
                    if transport in possible_transports:
1591
                        raise AssertionError()
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1592
                    possible_transports.append(transport)
1593
                return transport
1594
2485.8.43 by Vincent Ladeuil
Cleaning.
1595
    # We tried all the different protocols, now try one last time
1596
    # as a local protocol
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1597
    base = convert_path_to_url(base, 'Unsupported protocol: %s')
1598
2485.8.43 by Vincent Ladeuil
Cleaning.
1599
    # The default handler is the filesystem handler, stored as protocol None
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1600
    factory_list = transport_list_registry.get(None)
1601
    transport, last_err = _try_transport_factories(base, factory_list)
1602
2476.3.5 by Vincent Ladeuil
Naive implementation of transport reuse by Transport.get_transport().
1603
    return transport
1604
1605
2485.8.37 by Vincent Ladeuil
Fix merge multiple connections. Test suite *not* passing (sftp
1606
def _try_transport_factories(base, factory_list):
1607
    last_err = None
1608
    for factory in factory_list:
1609
        try:
1610
            return factory.get_obj()(base), None
1611
        except errors.DependencyNotPresent, e:
1612
            mutter("failed to instantiate transport %r for %r: %r" %
1613
                    (factory, base, e))
1614
            last_err = e
1615
            continue
1616
    return None, last_err
1617
1618
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1619
def do_catching_redirections(action, transport, redirected):
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1620
    """Execute an action with given transport catching redirections.
1621
1622
    This is a facility provided for callers needing to follow redirections
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1623
    silently. The silence is relative: it is the caller responsability to
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1624
    inform the user about each redirection or only inform the user of a user
1625
    via the exception parameter.
1626
1627
    :param action: A callable, what the caller want to do while catching
1628
                  redirections.
1629
    :param transport: The initial transport used.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1630
    :param redirected: A callable receiving the redirected transport and the
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1631
                  RedirectRequested exception.
1632
1633
    :return: Whatever 'action' returns
1634
    """
1635
    MAX_REDIRECTIONS = 8
1636
1637
    # If a loop occurs, there is little we can do. So we don't try to detect
1638
    # them, just getting out if too much redirections occurs. The solution
1639
    # is outside: where the loop is defined.
1640
    for redirections in range(MAX_REDIRECTIONS):
1641
        try:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1642
            return action(transport)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1643
        except errors.RedirectRequested, e:
1644
            redirection_notice = '%s is%s redirected to %s' % (
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1645
                e.source, e.permanently, e.target)
1646
            transport = redirected(transport, e, redirection_notice)
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1647
    else:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1648
        # Loop exited without resolving redirect ? Either the
1649
        # user has kept a very very very old reference or a loop
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1650
        # occurred in the redirections.  Nothing we can cure here:
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1651
        # tell the user. Note that as the user has been informed
1652
        # about each redirection (it is the caller responsibility
1653
        # to do that in redirected via the provided
1654
        # redirection_notice). The caller may provide more
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1655
        # information if needed (like what file or directory we
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1656
        # were trying to act upon when the redirection loop
2164.2.25 by Vincent Ladeuil
Fix typos noticed by Aaron.
1657
        # occurred).
2164.2.22 by Vincent Ladeuil
Take Aaron's review comments into account.
1658
        raise errors.TooManyRedirections
2164.2.21 by Vincent Ladeuil
Take bundles into account.
1659
1660
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1661
class Server(object):
1530.1.21 by Robert Collins
Review feedback fixes.
1662
    """A Transport Server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1663
1530.1.21 by Robert Collins
Review feedback fixes.
1664
    The Server interface provides a server for a given transport. We use
1665
    these servers as loopback testing tools. For any given transport the
1666
    Servers it provides must either allow writing, or serve the contents
1667
    of os.getcwdu() at the time setUp is called.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1668
1530.1.21 by Robert Collins
Review feedback fixes.
1669
    Note that these are real servers - they must implement all the things
1670
    that we want bzr transports to take advantage of.
1671
    """
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1672
1673
    def setUp(self):
1674
        """Setup the server to service requests."""
1675
1676
    def tearDown(self):
1677
        """Remove the server and cleanup any resources it owns."""
1678
1679
    def get_url(self):
1530.1.21 by Robert Collins
Review feedback fixes.
1680
        """Return a url for this server.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1681
1682
        If the transport does not represent a disk directory (i.e. it is
1530.1.21 by Robert Collins
Review feedback fixes.
1683
        a database like svn, or a memory only transport, it should return
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1684
        a connection to a newly established resource for this Server.
1530.1.21 by Robert Collins
Review feedback fixes.
1685
        Otherwise it should return a url that will provide access to the path
1686
        that was os.getcwdu() when setUp() was called.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1687
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1688
        Subsequent calls will return the same resource.
1689
        """
1690
        raise NotImplementedError
1691
1530.1.9 by Robert Collins
Test bogus urls with http in the new infrastructure.
1692
    def get_bogus_url(self):
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
1693
        """Return a url for this protocol, that will fail to connect.
3943.8.1 by Marius Kruger
remove all trailing whitespace from bzr source
1694
2018.5.104 by Andrew Bennetts
Completely rework chrooted transports.
1695
        This may raise NotImplementedError to indicate that this server cannot
1696
        provide bogus urls.
1697
        """
1530.1.9 by Robert Collins
Test bogus urls with http in the new infrastructure.
1698
        raise NotImplementedError
1699
1530.1.3 by Robert Collins
transport implementations now tested consistently.
1700
1185.16.81 by mbp at sourcefrog
[merge] robert
1701
# None is the default transport, for things with no url scheme
2241.2.9 by ghigo
add the 'file://' prefix to the urlspec topic
1702
register_transport_proto('file://',
1703
            help="Access using the standard filesystem (default)")
1185.16.79 by Martin Pool
Load transports when they're first used.
1704
register_lazy_transport('file://', 'bzrlib.transport.local', 'LocalTransport')
2241.2.3 by ghigo
removed the the registration of the 'None' transport, instead we use the set_default_transport function
1705
transport_list_registry.set_default_transport("file://")
2241.2.4 by ghigo
removed commented line
1706
2241.2.5 by ghigo
add the topics transport
1707
register_transport_proto('sftp://',
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1708
            help="Access using SFTP (most SSH servers provide SFTP).",
1709
            register_netloc=True)
1185.16.79 by Martin Pool
Load transports when they're first used.
1710
register_lazy_transport('sftp://', 'bzrlib.transport.sftp', 'SFTPTransport')
2164.2.7 by v.ladeuil+lp at free
First implementation of transport hints.
1711
# Decorated http transport
2241.2.5 by ghigo
add the topics transport
1712
register_transport_proto('http+urllib://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1713
#                help="Read-only access of branches exported on the web."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1714
                         register_netloc=True)
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
1715
register_lazy_transport('http+urllib://', 'bzrlib.transport.http._urllib',
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1716
                        'HttpTransport_urllib')
2241.2.5 by ghigo
add the topics transport
1717
register_transport_proto('https+urllib://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1718
#                help="Read-only access of branches exported on the web using SSL."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1719
                         register_netloc=True)
1540.3.23 by Martin Pool
Allow urls like http+pycurl://host/ to use a particular impl
1720
register_lazy_transport('https+urllib://', 'bzrlib.transport.http._urllib',
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1721
                        'HttpTransport_urllib')
2241.2.5 by ghigo
add the topics transport
1722
register_transport_proto('http+pycurl://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1723
#                help="Read-only access of branches exported on the web."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1724
                         register_netloc=True)
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1725
register_lazy_transport('http+pycurl://', 'bzrlib.transport.http._pycurl',
1726
                        'PyCurlTransport')
2241.2.5 by ghigo
add the topics transport
1727
register_transport_proto('https+pycurl://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1728
#                help="Read-only access of branches exported on the web using SSL."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1729
                         register_netloc=True)
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1730
register_lazy_transport('https+pycurl://', 'bzrlib.transport.http._pycurl',
1731
                        'PyCurlTransport')
2164.2.7 by v.ladeuil+lp at free
First implementation of transport hints.
1732
# Default http transports (last declared wins (if it can be imported))
2241.2.5 by ghigo
add the topics transport
1733
register_transport_proto('http://',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1734
                 help="Read-only access of branches exported on the web.")
2241.2.5 by ghigo
add the topics transport
1735
register_transport_proto('https://',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1736
            help="Read-only access of branches exported on the web using SSL.")
3882.2.1 by John Arbash Meinel
Use urllib for http connections, pycurl for https connections.
1737
# The default http implementation is urllib, but https is pycurl if available
1738
register_lazy_transport('http://', 'bzrlib.transport.http._pycurl',
1739
                        'PyCurlTransport')
1540.3.26 by Martin Pool
[merge] bzr.dev; pycurl not updated for readv yet
1740
register_lazy_transport('http://', 'bzrlib.transport.http._urllib',
1741
                        'HttpTransport_urllib')
1742
register_lazy_transport('https://', 'bzrlib.transport.http._urllib',
1743
                        'HttpTransport_urllib')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1744
register_lazy_transport('https://', 'bzrlib.transport.http._pycurl',
1745
                        'PyCurlTransport')
2241.2.4 by ghigo
removed commented line
1746
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1747
register_transport_proto('ftp://', help="Access using passive FTP.")
1185.36.4 by Daniel Silverstone
Add FTP transport
1748
register_lazy_transport('ftp://', 'bzrlib.transport.ftp', 'FtpTransport')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1749
register_transport_proto('aftp://', help="Access using active FTP.")
1185.36.4 by Daniel Silverstone
Add FTP transport
1750
register_lazy_transport('aftp://', 'bzrlib.transport.ftp', 'FtpTransport')
2241.2.4 by ghigo
removed commented line
1751
3508.1.10 by Vincent Ladeuil
Start supporting pyftpdlib as an ftp test server.
1752
try:
1753
    import kerberos
1754
    kerberos_available = True
1755
except ImportError:
1756
    kerberos_available = False
1757
1758
if kerberos_available:
1759
    # Default to trying GSSAPI authentication (if the kerberos module is
1760
    # available)
1761
    register_transport_proto('ftp+gssapi://', register_netloc=True)
1762
    register_lazy_transport('ftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1763
                            'GSSAPIFtpTransport')
1764
    register_transport_proto('aftp+gssapi://', register_netloc=True)
1765
    register_lazy_transport('aftp+gssapi://', 'bzrlib.transport.ftp._gssapi',
1766
                            'GSSAPIFtpTransport')
1767
    register_transport_proto('ftp+nogssapi://', register_netloc=True)
1768
    register_transport_proto('aftp+nogssapi://', register_netloc=True)
1769
1770
    register_lazy_transport('ftp://', 'bzrlib.transport.ftp._gssapi',
1771
                            'GSSAPIFtpTransport')
1772
    register_lazy_transport('aftp://', 'bzrlib.transport.ftp._gssapi',
1773
                            'GSSAPIFtpTransport')
1774
    register_lazy_transport('ftp+nogssapi://', 'bzrlib.transport.ftp',
1775
                            'FtpTransport')
1776
    register_lazy_transport('aftp+nogssapi://', 'bzrlib.transport.ftp',
1777
                            'FtpTransport')
3331.2.4 by Jelmer Vernooij
Move GSSAPI support to a separate file.
1778
2241.2.1 by ghigo
Add the TransportRegistry class
1779
register_transport_proto('memory://')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1780
register_lazy_transport('memory://', 'bzrlib.transport.memory',
1781
                        'MemoryTransport')
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1782
1783
# chroots cannot be implicitly accessed, they must be explicitly created:
2241.2.1 by ghigo
Add the TransportRegistry class
1784
register_transport_proto('chroot+')
2241.3.6 by ghigo
Upgraded to the latest bzr.dev
1785
2241.2.5 by ghigo
add the topics transport
1786
register_transport_proto('readonly+',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1787
#              help="This modifier converts any transport to be readonly."
1788
            )
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1789
register_lazy_transport('readonly+', 'bzrlib.transport.readonly',
1790
                        'ReadonlyTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1791
2617.4.5 by Robert Collins
Reinstate the fakenfs+ decorator registration.
1792
register_transport_proto('fakenfs+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1793
register_lazy_transport('fakenfs+', 'bzrlib.transport.fakenfs',
1794
                        'FakeNFSTransportDecorator')
2617.4.5 by Robert Collins
Reinstate the fakenfs+ decorator registration.
1795
3675.1.1 by Martin Pool
Merge and update log+ transport decorator
1796
register_transport_proto('log+')
1797
register_lazy_transport('log+', 'bzrlib.transport.log', 'TransportLogDecorator')
1798
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1799
register_transport_proto('trace+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1800
register_lazy_transport('trace+', 'bzrlib.transport.trace',
1801
                        'TransportTraceDecorator')
2745.5.3 by Robert Collins
* Move transport logging into a new transport class
1802
2617.4.1 by Robert Collins
Add a new transport decorator unlistable+ for testing.
1803
register_transport_proto('unlistable+')
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1804
register_lazy_transport('unlistable+', 'bzrlib.transport.unlistable',
1805
                        'UnlistableTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1806
1807
register_transport_proto('brokenrename+')
1808
register_lazy_transport('brokenrename+', 'bzrlib.transport.brokenrename',
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1809
                        'BrokenRenameTransportDecorator')
2555.3.8 by Martin Pool
Add new BrokenRenameTransportDecorator
1810
2241.2.1 by ghigo
Add the TransportRegistry class
1811
register_transport_proto('vfat+')
1910.19.1 by Andrew Bennetts
Support bzr:// urls to work with the new RPC-based transport which will be used
1812
register_lazy_transport('vfat+',
1608.2.4 by Martin Pool
[broken] Add FakeFVATTransport
1813
                        'bzrlib.transport.fakevfat',
1814
                        'FakeVFATTransportDecorator')
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1815
3313.3.4 by Andrew Bennetts
Add a 'nosmart+' transport decorator.
1816
register_transport_proto('nosmart+')
1817
register_lazy_transport('nosmart+', 'bzrlib.transport.nosmart',
1818
                        'NoSmartTransportDecorator')
1819
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1820
# These two schemes were registered, but don't seem to have an actual transport
1821
# protocol registered
1822
for scheme in ['ssh', 'bzr+loopback']:
2919.2.2 by John Arbash Meinel
fix a simple typo
1823
    register_urlparse_netloc_protocol(scheme)
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1824
del scheme
1825
2241.2.5 by ghigo
add the topics transport
1826
register_transport_proto('bzr://',
2811.1.1 by Andrew Bennetts
Cherrypick fix proposed for 0.90.
1827
            help="Fast access using the Bazaar smart server.",
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1828
                         register_netloc=True)
2241.2.5 by ghigo
add the topics transport
1829
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1830
register_lazy_transport('bzr://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1831
                        'RemoteTCPTransport')
3453.5.1 by Andrew Bennetts
Add {bzrdir,repository,branch}_implementations tests for Remote objects using protocol v2 and pre-1.6 RPCs.
1832
register_transport_proto('bzr-v2://', register_netloc=True)
1833
1834
register_lazy_transport('bzr-v2://', 'bzrlib.transport.remote',
1835
                        'RemoteTCPTransportV2Only')
2241.2.5 by ghigo
add the topics transport
1836
register_transport_proto('bzr+http://',
2241.2.11 by ghigo
On the basis of Robert Collins and John Arbash Meinel
1837
#                help="Fast access using the Bazaar smart server over HTTP."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1838
                         register_netloc=True)
1839
register_lazy_transport('bzr+http://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1840
                        'RemoteHTTPTransport')
2651.1.1 by John Ferlito
bzr+https support
1841
register_transport_proto('bzr+https://',
1842
#                help="Fast access using the Bazaar smart server over HTTPS."
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1843
                         register_netloc=True)
2651.1.1 by John Ferlito
bzr+https support
1844
register_lazy_transport('bzr+https://',
1845
                        'bzrlib.transport.remote',
1846
                        'RemoteHTTPTransport')
2241.2.5 by ghigo
add the topics transport
1847
register_transport_proto('bzr+ssh://',
2919.2.1 by John Arbash Meinel
Register netloc protocols as soon as the protocol is registered.
1848
            help="Fast access using the Bazaar smart server over SSH.",
1849
            register_netloc=True)
3004.2.1 by Vincent Ladeuil
Fix 150860 by leaving port as user specified it.
1850
register_lazy_transport('bzr+ssh://', 'bzrlib.transport.remote',
2413.2.1 by Andrew Bennetts
Rename Smart.*Transport classes to RemoteTransport, RemoteTCPTransport, etc.
1851
                        'RemoteSSHTransport')
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
1852
4011.4.2 by Jelmer Vernooij
Register ssh: rather than ssh://, avoid referring to smart server, which users may not be familiar with.
1853
register_transport_proto('ssh:')
4032.1.2 by John Arbash Meinel
Track down a few more files that have trailing whitespace.
1854
register_lazy_transport('ssh:', 'bzrlib.transport.remote',
4011.4.1 by Jelmer Vernooij
Point out bzr+ssh:// to the user when they use ssh://.
1855
                        'HintingSSHTransport')
4370.4.6 by Jelmer Vernooij
Move server protocol registry to bzrlib.transport.
1856
1857
1858
transport_server_registry = registry.Registry()
1859
transport_server_registry.register_lazy('bzr', 'bzrlib.smart.server', 
1860
    'serve_bzr', help="The Bazaar smart server protocol over TCP. (default port: 4155)")
1861
transport_server_registry.default_key = 'bzr'