← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-19 22:34:02 UTC
  • mto: This revision was merged to the branch mainline in revision 6089.
  • Revision ID: jelmer@samba.org-20110819223402-wjywqb0fa1xxx522
Use get_transport_from_{url,path} in more places.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
1
 
# Copyright (C) 2005, 2006 Canonical Ltd
 
1
# Copyright (C) 2005-2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
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
 
16
 
 
17
from cStringIO import StringIO
16
18
 
17
19
from bzrlib.lazy_import import lazy_import
18
20
lazy_import(globals(), """
19
21
from bzrlib import (
20
22
    errors,
 
23
    transport as _mod_transport,
21
24
    urlutils,
22
25
    )
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
25
28
""")
26
 
 
27
 
 
28
 
def read_bundle_from_url(url):
29
 
    """Read a bundle from a given URL.
30
 
 
31
 
    :return: A BundleReader, may raise NotABundle if the target 
32
 
            is not a proper bundle.
 
29
from bzrlib.trace import note
 
30
 
 
31
 
 
32
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
 
33
    """Read mergable object from a given URL.
 
34
 
 
35
    :return: An object supporting get_target_revision.  Raises NotABundle if
 
36
        the target is not a mergeable type.
33
37
    """
34
 
    url = urlutils.normalize_url(url)
35
 
    url, filename = urlutils.split(url, exclude_trailing_slash=False)
36
 
    if not filename:
37
 
        # A path to a directory was passed in
38
 
        # definitely not a bundle
39
 
        raise errors.NotABundle('A directory cannot be a bundle')
40
 
 
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.
 
38
    child_transport = _mod_transport.get_transport(url,
 
39
        possible_transports=possible_transports)
 
40
    transport = child_transport.clone('..')
 
41
    filename = transport.relpath(child_transport.base)
 
42
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
43
                                                         _do_directive)
 
44
    return mergeable
 
45
 
 
46
 
 
47
def read_mergeable_from_transport(transport, filename, _do_directive=True):
 
48
    def get_bundle(transport):
 
49
        return StringIO(transport.get_bytes(filename)), transport
 
50
 
 
51
    def redirected_transport(transport, exception, redirection_notice):
 
52
        note(redirection_notice)
 
53
        url, filename = urlutils.split(exception.target,
 
54
                                       exclude_trailing_slash=False)
 
55
        if not filename:
 
56
            raise errors.NotABundle('A directory cannot be a bundle')
 
57
        return _mod_transport.get_transport_from_url(url)
 
58
 
44
59
    try:
45
 
        t = _get_transport(url)
46
 
        f = t.get(filename)
47
 
        return _serializer.read_bundle(f)
 
60
        bytef, transport = _mod_transport.do_catching_redirections(
 
61
            get_bundle, transport, redirected_transport)
 
62
    except errors.TooManyRedirections:
 
63
        raise errors.NotABundle(transport.clone(filename).base)
 
64
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
65
        raise
48
66
    except (errors.TransportError, errors.PathError), e:
49
67
        raise errors.NotABundle(str(e))
50
68
    except (IOError,), e:
53
71
        # doesn't always fail at get() time. Sometimes it fails
54
72
        # during read. And that raises a generic IOError with
55
73
        # just the string 'Failure'
56
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
74
        # StubSFTPServer does fail during get() (because of prefetch)
57
75
        # so it has an opportunity to translate the error.
58
76
        raise errors.NotABundle(str(e))
59
77
 
 
78
    if _do_directive:
 
79
        try:
 
80
            return MergeDirective.from_lines(bytef), transport
 
81
        except errors.NotAMergeDirective:
 
82
            bytef.seek(0)
 
83
 
 
84
    return _serializer.read_bundle(bytef), transport