/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: Martin Pool
  • Date: 2007-10-03 08:06:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2901.
  • Revision ID: mbp@sourcefrog.net-20071003080644-oivy0gkg98sex0ed
Avoid internal error tracebacks on failure to lock on readonly transport (#129701).

Add new LockFailed, which doesn't imply that we failed to get it because of
contention.  Raise this if we fail to create the pending or lock directories
because of Transport errors.

UnlockableTransport is not an internal error.

ReadOnlyLockError has a message which didn't match its name or usage; it's now
deprecated and callers are updated to use LockFailed which is more appropriate.

Add zero_ninetytwo deprecation symbol.

Unify assertMatchesRe with TestCase.assertContainsRe.

When the constructor is deprecated, just say that the class is deprecated, not
the __init__ method - this works better with applyDeprecated in tests.

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