← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Robert Collins
  • Date: 2009-07-07 04:32:13 UTC
  • mto: This revision was merged to the branch mainline in revision 4524.
  • Revision ID: robertc@robertcollins.net-20090707043213-4hjjhgr40iq7gk2d
More informative assertions in xml serialisation.

Show diffs side-by-side

added added

removed removed

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