← Back to branch summary

~mhammond/bzr/update-r

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Mark Hammond
  • Date: 2008-08-19 01:09:37 UTC
  • mfrom: (2009.1.1629 +trunk)
  • Revision ID: mhammond@skippinet.com.au-20080819010937-aohklatall0s6m3z
First attempt to merge .dev and resolve the conflicts (but tests are 
failing)

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
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 bzrlib.bundle.serializer import read_bundle
18
 
import bzrlib.errors as errors
19
 
import bzrlib.urlutils
20
 
import bzrlib.transport
 
17
from StringIO import StringIO
 
18
 
 
19
from bzrlib.lazy_import import lazy_import
 
20
lazy_import(globals(), """
 
21
from bzrlib import (
 
22
    errors,
 
23
    urlutils,
 
24
    )
 
25
from bzrlib.bundle import serializer as _serializer
 
26
from bzrlib.transport import (
 
27
    do_catching_redirections,
 
28
    get_transport,
 
29
    )
 
30
""")
 
31
from bzrlib.trace import note
21
32
 
22
33
 
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:
 
44
    child_transport = get_transport(url,
 
45
        possible_transports=possible_transports)
 
46
    transport = child_transport.clone('..')
 
47
    filename = transport.relpath(child_transport.base)
 
48
    if filename.endswith('/'):
31
49
        # A path to a directory was passed in
32
50
        # definitely not a bundle
33
51
        raise errors.NotABundle('A directory cannot be a bundle')
34
 
 
 
52
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
53
                                                         _do_directive)
 
54
    return mergeable
 
55
 
 
56
 
 
57
def read_mergeable_from_transport(transport, filename, _do_directive=True):
35
58
    # All of this must be in the try/except
36
59
    # Some transports cannot detect that we are trying to read a
37
60
    # directory until we actually issue read() on the handle.
38
61
    try:
39
 
        t = bzrlib.transport.get_transport(url)
40
 
        f = t.get(filename)
41
 
        return read_bundle(f)
 
62
        def get_bundle(transport):
 
63
            return transport.get(filename), transport
 
64
 
 
65
        def redirected_transport(transport, exception, redirection_notice):
 
66
            note(redirection_notice)
 
67
            url, filename = urlutils.split(exception.target,
 
68
                                           exclude_trailing_slash=False)
 
69
            if not filename:
 
70
                raise errors.NotABundle('A directory cannot be a bundle')
 
71
            return get_transport(url)
 
72
 
 
73
        try:
 
74
            f, transport = do_catching_redirections(get_bundle, transport,
 
75
                                                    redirected_transport)
 
76
        except errors.TooManyRedirections:
 
77
            raise errors.NotABundle(str(url))
 
78
 
 
79
        if _do_directive:
 
80
            from bzrlib.merge_directive import MergeDirective
 
81
            directive = MergeDirective.from_lines(f.readlines())
 
82
            return directive, transport
 
83
        else:
 
84
            return _serializer.read_bundle(f), transport
42
85
    except (errors.TransportError, errors.PathError), e:
43
86
        raise errors.NotABundle(str(e))
44
87
    except (IOError,), e:
50
93
        # StubSFTPServer does fail during get() (because of prefetch) 
51
94
        # so it has an opportunity to translate the error.
52
95
        raise errors.NotABundle(str(e))
53
 
 
 
96
    except errors.NotAMergeDirective:
 
97
        f.seek(0)
 
98
        return _serializer.read_bundle(f), transport