4763.2.4
by John Arbash Meinel
merge bzr.2.1 in preparation for NEWS entry. |
1 |
# Copyright (C) 2005-2010 Canonical Ltd
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
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
|
|
4183.7.1
by Sabin Iacob
update FSF mailing address |
15 |
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
16 |
|
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
17 |
from cStringIO import StringIO |
18 |
||
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
19 |
from bzrlib.lazy_import import lazy_import |
20 |
lazy_import(globals(), """ |
|
21 |
from bzrlib import (
|
|
22 |
errors,
|
|
23 |
urlutils,
|
|
24 |
)
|
|
2095.2.1
by John Arbash Meinel
Fix imports for bundles. |
25 |
from bzrlib.bundle import serializer as _serializer
|
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
26 |
from bzrlib.merge_directive import MergeDirective
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
27 |
from bzrlib.transport import (
|
28 |
do_catching_redirections,
|
|
29 |
get_transport,
|
|
30 |
)
|
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
31 |
""") |
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
32 |
from bzrlib.trace import note |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
33 |
|
34 |
||
3251.4.10
by Aaron Bentley
Pull of launchpad locations works (abentley, #181945) |
35 |
def read_mergeable_from_url(url, _do_directive=True, possible_transports=None): |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
36 |
"""Read mergable object from a given URL.
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
37 |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
38 |
:return: An object supporting get_target_revision. Raises NotABundle if
|
39 |
the target is not a mergeable type.
|
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
40 |
"""
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
41 |
child_transport = get_transport(url, |
42 |
possible_transports=possible_transports) |
|
43 |
transport = child_transport.clone('..') |
|
44 |
filename = transport.relpath(child_transport.base) |
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
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): |
|
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
51 |
def get_bundle(transport): |
4792.7.3
by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable |
52 |
return StringIO(transport.get_bytes(filename)), transport |
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
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('A directory cannot be a bundle') |
|
60 |
return get_transport(url) |
|
61 |
||
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
62 |
try: |
4792.7.3
by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable |
63 |
bytef, transport = do_catching_redirections(get_bundle, transport, |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
64 |
redirected_transport) |
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
65 |
except errors.TooManyRedirections: |
66 |
raise errors.NotABundle(transport.clone(filename).base) |
|
3983.4.1
by John Arbash Meinel
Don't trap a regular ConnectionError when trying to read a mergeable from a url. |
67 |
except (errors.ConnectionReset, errors.ConnectionError), e: |
3703.2.1
by Andrew Bennetts
Allow ConnectionReset to propagate from read_mergeable_from_url. |
68 |
raise
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
69 |
except (errors.TransportError, errors.PathError), e: |
70 |
raise errors.NotABundle(str(e)) |
|
1793.4.1
by John Arbash Meinel
Handle the SFTP exception that you can't read() from the result of get() to a dir |
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'
|
|
3943.8.1
by Marius Kruger
remove all trailing whitespace from bzr source |
77 |
# StubSFTPServer does fail during get() (because of prefetch)
|
1793.4.1
by John Arbash Meinel
Handle the SFTP exception that you can't read() from the result of get() to a dir |
78 |
# so it has an opportunity to translate the error.
|
79 |
raise errors.NotABundle(str(e)) |
|
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
80 |
|
81 |
if _do_directive: |
|
82 |
try: |
|
4792.7.3
by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable |
83 |
return MergeDirective.from_lines(bytef), transport |
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
84 |
except errors.NotAMergeDirective: |
4792.7.3
by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable |
85 |
bytef.seek(0) |
4792.7.2
by Martin
Read potential bundles all in one go, then chop up again for the parsing code |
86 |
|
4792.7.3
by Martin
MergeDirective.from_lines claims to want an iterable but currently requires a list, rewrite so it really wants an iterable |
87 |
return _serializer.read_bundle(bytef), transport |