← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-07 14:38:26 UTC
  • mfrom: (6123.1.10 +trunk)
  • mto: (6123.1.14 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6124.
  • Revision ID: jriddell@canonical.com-20110907143826-aewhasbrhsq8khyp
merge in trunk

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 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.
 
37
    """
 
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_from_url(url)
 
58
 
 
59
    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
 
66
    except (errors.TransportError, errors.PathError), e:
 
67
        raise errors.NotABundle(str(e))
 
68
    except (IOError,), e:
 
69
        # jam 20060707
 
70
        # Abstraction leakage, SFTPTransport.get('directory')
 
71
        # doesn't always fail at get() time. Sometimes it fails
 
72
        # during read. And that raises a generic IOError with
 
73
        # just the string 'Failure'
 
74
        # StubSFTPServer does fail during get() (because of prefetch)
 
75
        # so it has an opportunity to translate the error.
 
76
        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