← 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: 2011-08-17 18:13:57 UTC
  • mfrom: (5268.7.29 transport-segments)
  • Revision ID: pqm@pqm.ubuntu.com-20110817181357-y5q5eth1hk8bl3om
(jelmer) Allow specifying the colocated branch to use in the branch URL,
 and retrieving the branch name using ControlDir._get_selected_branch.
 (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

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