13
13
# You should have received a copy of the GNU General Public License
14
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
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17
from cStringIO import StringIO
19
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
17
20
from bzrlib.lazy_import import lazy_import
18
21
lazy_import(globals(), """
19
22
from bzrlib import (
23
26
from bzrlib.bundle import serializer as _serializer
24
from bzrlib.transport import get_transport as _get_transport
27
from bzrlib.merge_directive import MergeDirective
28
from bzrlib.transport import (
29
do_catching_redirections,
33
from bzrlib.trace import note
36
@deprecated_function(deprecated_in((1, 12, 0)))
28
37
def read_bundle_from_url(url):
29
"""Read a bundle from a given URL.
31
:return: A BundleReader, may raise NotABundle if the target
32
is not a proper bundle.
38
return read_mergeable_from_url(url, _do_directive=False)
41
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
42
"""Read mergable object from a given URL.
44
:return: An object supporting get_target_revision. Raises NotABundle if
45
the target is not a mergeable type.
34
url = urlutils.normalize_url(url)
35
url, filename = urlutils.split(url, exclude_trailing_slash=False)
37
# A path to a directory was passed in
38
# definitely not a bundle
39
raise errors.NotABundle('A directory cannot be a bundle')
41
# All of this must be in the try/except
42
# Some transports cannot detect that we are trying to read a
43
# directory until we actually issue read() on the handle.
47
child_transport = get_transport(url,
48
possible_transports=possible_transports)
49
transport = child_transport.clone('..')
50
filename = transport.relpath(child_transport.base)
51
mergeable, transport = read_mergeable_from_transport(transport, filename,
56
def read_mergeable_from_transport(transport, filename, _do_directive=True):
57
def get_bundle(transport):
58
return StringIO(transport.get_bytes(filename)), transport
60
def redirected_transport(transport, exception, redirection_notice):
61
note(redirection_notice)
62
url, filename = urlutils.split(exception.target,
63
exclude_trailing_slash=False)
65
raise errors.NotABundle('A directory cannot be a bundle')
66
return get_transport(url)
45
t = _get_transport(url)
47
return _serializer.read_bundle(f)
69
bytef, transport = do_catching_redirections(get_bundle, transport,
71
except errors.TooManyRedirections:
72
raise errors.NotABundle(transport.clone(filename).base)
73
except (errors.ConnectionReset, errors.ConnectionError), e:
48
75
except (errors.TransportError, errors.PathError), e:
49
76
raise errors.NotABundle(str(e))
50
77
except (IOError,), e:
53
80
# doesn't always fail at get() time. Sometimes it fails
54
81
# during read. And that raises a generic IOError with
55
82
# just the string 'Failure'
56
# StubSFTPServer does fail during get() (because of prefetch)
83
# StubSFTPServer does fail during get() (because of prefetch)
57
84
# so it has an opportunity to translate the error.
58
85
raise errors.NotABundle(str(e))
89
return MergeDirective.from_lines(bytef), transport
90
except errors.NotAMergeDirective:
93
return _serializer.read_bundle(bytef), transport