← 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: 2006-07-11 15:04:57 UTC
  • mto: This revision was merged to the branch mainline in revision 1858.
  • Revision ID: abentley@panoramicfeedback.com-20060711150457-d4c96e9c60843973
Ensure commit respects file spec when committing removals

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2006 by 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from cStringIO import StringIO
18
 
 
19
 
from bzrlib.lazy_import import lazy_import
20
 
lazy_import(globals(), """
21
 
from bzrlib import (
22
 
    errors,
23
 
    transport as _mod_transport,
24
 
    urlutils,
25
 
    )
26
 
from bzrlib.bundle import serializer as _serializer
27
 
from bzrlib.merge_directive import MergeDirective
28
 
""")
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.
 
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
 
 
23
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.
37
28
    """
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(url)
58
 
 
 
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
 
 
35
    # All of this must be in the try/except
 
36
    # Some transports cannot detect that we are trying to read a
 
37
    # directory until we actually issue read() on the handle.
59
38
    try:
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
 
39
        t = bzrlib.transport.get_transport(url)
 
40
        f = t.get(filename)
 
41
        return read_bundle(f)
66
42
    except (errors.TransportError, errors.PathError), e:
67
43
        raise errors.NotABundle(str(e))
68
44
    except (IOError,), e:
71
47
        # doesn't always fail at get() time. Sometimes it fails
72
48
        # during read. And that raises a generic IOError with
73
49
        # just the string 'Failure'
74
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
50
        # StubSFTPServer does fail during get() (because of prefetch) 
75
51
        # so it has an opportunity to translate the error.
76
52
        raise errors.NotABundle(str(e))
77
53
 
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