← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Martin Pool
  • Date: 2009-09-14 01:19:11 UTC
  • mto: This revision was merged to the branch mainline in revision 4688.
  • Revision ID: mbp@sourcefrog.net-20090914011911-llu9ujul97k8f8s7
https://launchpad.net/bugs/406113
News for fix of 406113

Show diffs side-by-side

added added

removed removed

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