← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Patch Queue Manager
  • Date: 2014-04-09 13:36:25 UTC
  • mfrom: (6592.1.2 1303879-py27-issues)
  • Revision ID: pqm@pqm.ubuntu.com-20140409133625-s24spv3kha2w2860
(vila) Fix python-2.7.6 test failures. (Vincent Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/__init__.py
 
1
# Copyright (C) 2005-2010 Canonical Ltd
 
2
#
 
3
# This program is free software; you can redistribute it and/or modify
 
4
# it under the terms of the GNU General Public License as published by
 
5
# the Free Software Foundation; either version 2 of the License, or
 
6
# (at your option) any later version.
 
7
#
 
8
# This program is distributed in the hope that it will be useful,
 
9
# but WITHOUT ANY WARRANTY; without even the implied warranty of
 
10
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 
11
# GNU General Public License for more details.
 
12
#
 
13
# You should have received a copy of the GNU General Public License
 
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 __future__ import absolute_import
 
18
 
 
19
from cStringIO import StringIO
 
20
 
 
21
from bzrlib.lazy_import import lazy_import
 
22
lazy_import(globals(), """
 
23
from bzrlib import (
 
24
    errors,
 
25
    transport as _mod_transport,
 
26
    urlutils,
 
27
    )
 
28
from bzrlib.bundle import serializer as _serializer
 
29
from bzrlib.merge_directive import MergeDirective
 
30
from bzrlib.i18n import gettext
 
31
""")
 
32
from bzrlib.trace import note
 
33
 
 
34
 
 
35
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None):
 
36
    """Read mergable object from a given URL.
 
37
 
 
38
    :return: An object supporting get_target_revision.  Raises NotABundle if
 
39
        the target is not a mergeable type.
 
40
    """
 
41
    child_transport = _mod_transport.get_transport(url,
 
42
        possible_transports=possible_transports)
 
43
    transport = child_transport.clone('..')
 
44
    filename = transport.relpath(child_transport.base)
 
45
    mergeable, transport = read_mergeable_from_transport(transport, filename,
 
46
                                                         _do_directive)
 
47
    return mergeable
 
48
 
 
49
 
 
50
def read_mergeable_from_transport(transport, filename, _do_directive=True):
 
51
    def get_bundle(transport):
 
52
        return StringIO(transport.get_bytes(filename)), transport
 
53
 
 
54
    def redirected_transport(transport, exception, redirection_notice):
 
55
        note(redirection_notice)
 
56
        url, filename = urlutils.split(exception.target,
 
57
                                       exclude_trailing_slash=False)
 
58
        if not filename:
 
59
            raise errors.NotABundle(gettext('A directory cannot be a bundle'))
 
60
        return _mod_transport.get_transport_from_url(url)
 
61
 
 
62
    try:
 
63
        bytef, transport = _mod_transport.do_catching_redirections(
 
64
            get_bundle, transport, redirected_transport)
 
65
    except errors.TooManyRedirections:
 
66
        raise errors.NotABundle(transport.clone(filename).base)
 
67
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
68
        raise
 
69
    except (errors.TransportError, errors.PathError), e:
 
70
        raise errors.NotABundle(str(e))
 
71
    except (IOError,), e:
 
72
        # jam 20060707
 
73
        # Abstraction leakage, SFTPTransport.get('directory')
 
74
        # doesn't always fail at get() time. Sometimes it fails
 
75
        # during read. And that raises a generic IOError with
 
76
        # just the string 'Failure'
 
77
        # StubSFTPServer does fail during get() (because of prefetch)
 
78
        # so it has an opportunity to translate the error.
 
79
        raise errors.NotABundle(str(e))
 
80
 
 
81
    if _do_directive:
 
82
        try:
 
83
            return MergeDirective.from_lines(bytef), transport
 
84
        except errors.NotAMergeDirective:
 
85
            bytef.seek(0)
 
86
 
 
87
    return _serializer.read_bundle(bytef), transport