/brz/remove-bazaar

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