← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2007-03-21 04:49:05 UTC
  • mfrom: (2367.1.1 integration)
  • Revision ID: pqm@pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
Update NEWS to match bzr 0.15.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
14
14
# along with this program; if not, write to the Free Software
15
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
 
from StringIO import StringIO
18
 
 
19
17
from bzrlib.lazy_import import lazy_import
20
18
lazy_import(globals(), """
21
19
from bzrlib import (
23
21
    urlutils,
24
22
    )
25
23
from bzrlib.bundle import serializer as _serializer
26
 
from bzrlib.transport import (
27
 
    do_catching_redirections,
28
 
    get_transport,
29
 
    )
 
24
from bzrlib.transport import get_transport as _get_transport
30
25
""")
31
 
from bzrlib.trace import note
32
26
 
33
27
 
34
28
def read_bundle_from_url(url):
35
 
    return read_mergeable_from_url(url, _do_directive=False)
36
 
 
37
 
def read_mergeable_from_url(url, _do_directive=True):
38
 
    """Read mergable object from a given URL.
39
 
 
40
 
    :return: An object supporting get_target_revision.  Raises NotABundle if
41
 
        the target is not a mergeable type.
 
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.
42
33
    """
43
 
    from bzrlib.merge_directive import MergeDirective
44
34
    url = urlutils.normalize_url(url)
45
35
    url, filename = urlutils.split(url, exclude_trailing_slash=False)
46
36
    if not filename:
52
42
    # Some transports cannot detect that we are trying to read a
53
43
    # directory until we actually issue read() on the handle.
54
44
    try:
55
 
        transport = get_transport(url)
56
 
 
57
 
        def get_bundle(transport):
58
 
            return transport.get(filename)
59
 
 
60
 
        def redirected_transport(transport, exception, redirection_notice):
61
 
            note(redirection_notice)
62
 
            url, filename = urlutils.split(exception.target,
63
 
                                           exclude_trailing_slash=False)
64
 
            if not filename:
65
 
                raise errors.NotABundle('A directory cannot be a bundle')
66
 
            return get_transport(url)
67
 
 
68
 
        try:
69
 
            f = do_catching_redirections(get_bundle, transport,
70
 
                                         redirected_transport)
71
 
        except errors.TooManyRedirections:
72
 
            raise errors.NotABundle(str(url))
73
 
 
74
 
        if _do_directive:
75
 
            directive = MergeDirective.from_lines(f.readlines())
76
 
            return directive
77
 
        else:
78
 
            return _serializer.read_bundle(f)
 
45
        t = _get_transport(url)
 
46
        f = t.get(filename)
 
47
        return _serializer.read_bundle(f)
79
48
    except (errors.TransportError, errors.PathError), e:
80
49
        raise errors.NotABundle(str(e))
81
50
    except (IOError,), e:
87
56
        # StubSFTPServer does fail during get() (because of prefetch) 
88
57
        # so it has an opportunity to translate the error.
89
58
        raise errors.NotABundle(str(e))
90
 
    except errors.NotAMergeDirective:
91
 
        f.seek(0)
92
 
        return _serializer.read_bundle(f)
 
59