← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

Fix up inter_changes with dirstate both C and python.

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