← 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: 2010-01-15 04:49:48 UTC
  • mfrom: (3984.5.22 switch-r-183559)
  • Revision ID: pqm@pqm.ubuntu.com-20100115044948-yxz5m3vchxapbq22
(andrew) Add --revision option to 'bzr switch'. (#184559)

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 cStringIO import StringIO
 
18
 
 
19
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
19
20
from bzrlib.lazy_import import lazy_import
20
21
lazy_import(globals(), """
21
22
from bzrlib import (
23
24
    urlutils,
24
25
    )
25
26
from bzrlib.bundle import serializer as _serializer
 
27
from bzrlib.merge_directive import MergeDirective
26
28
from bzrlib.transport import (
27
29
    do_catching_redirections,
28
30
    get_transport,
31
33
from bzrlib.trace import note
32
34
 
33
35
 
 
36
@deprecated_function(deprecated_in((1, 12, 0)))
34
37
def read_bundle_from_url(url):
35
38
    return read_mergeable_from_url(url, _do_directive=False)
36
39
 
45
48
        possible_transports=possible_transports)
46
49
    transport = child_transport.clone('..')
47
50
    filename = transport.relpath(child_transport.base)
48
 
    if filename.endswith('/'):
49
 
        # A path to a directory was passed in
50
 
        # definitely not a bundle
51
 
        raise errors.NotABundle('A directory cannot be a bundle')
52
51
    mergeable, transport = read_mergeable_from_transport(transport, filename,
53
52
                                                         _do_directive)
54
53
    return mergeable
55
54
 
56
55
 
57
56
def read_mergeable_from_transport(transport, filename, _do_directive=True):
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.
 
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
 
61
68
    try:
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,
 
69
        bytef, transport = do_catching_redirections(get_bundle, transport,
75
70
                                                    redirected_transport)
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
 
71
    except errors.TooManyRedirections:
 
72
        raise errors.NotABundle(transport.clone(filename).base)
 
73
    except (errors.ConnectionReset, errors.ConnectionError), e:
 
74
        raise
85
75
    except (errors.TransportError, errors.PathError), e:
86
76
        raise errors.NotABundle(str(e))
87
77
    except (IOError,), e:
90
80
        # doesn't always fail at get() time. Sometimes it fails
91
81
        # during read. And that raises a generic IOError with
92
82
        # just the string 'Failure'
93
 
        # StubSFTPServer does fail during get() (because of prefetch) 
 
83
        # StubSFTPServer does fail during get() (because of prefetch)
94
84
        # so it has an opportunity to translate the error.
95
85
        raise errors.NotABundle(str(e))
96
 
    except errors.NotAMergeDirective:
97
 
        f.seek(0)
98
 
        return _serializer.read_bundle(f), transport
 
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