← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Aaron Bentley
  • Date: 2007-07-17 13:27:14 UTC
  • mfrom: (2624 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2631.
  • Revision ID: abentley@panoramicfeedback.com-20070717132714-tmzx9khmg9501k51
Merge from bzr.dev

Show diffs side-by-side

added added

removed removed

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