2052.3.2
by John Arbash Meinel
Change Copyright .. by Canonical to Copyright ... Canonical |
1 |
# Copyright (C) 2005, 2006 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
|
|
15 |
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
16 |
||
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
17 |
from StringIO 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
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
26 |
from bzrlib.transport import (
|
27 |
do_catching_redirections,
|
|
28 |
get_transport,
|
|
29 |
)
|
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
30 |
""") |
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
31 |
from bzrlib.trace import note |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
32 |
|
33 |
||
34 |
def read_bundle_from_url(url): |
|
1551.14.7
by Aaron Bentley
test suite fixes |
35 |
return read_mergeable_from_url(url, _do_directive=False) |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
36 |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
37 |
def read_mergeable_from_url(url, _do_directive=True): |
38 |
"""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 |
39 |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
40 |
:return: An object supporting get_target_revision. Raises NotABundle if
|
41 |
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 |
42 |
"""
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
43 |
from bzrlib.merge_directive import MergeDirective |
2167.2.1
by Aaron Bentley
Fix reading bundles from http URLs |
44 |
url = urlutils.normalize_url(url) |
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
45 |
url, filename = urlutils.split(url, exclude_trailing_slash=False) |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
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 |
# All of this must be in the try/except
|
|
52 |
# Some transports cannot detect that we are trying to read a
|
|
53 |
# directory until we actually issue read() on the handle.
|
|
54 |
try: |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
55 |
transport = get_transport(url) |
56 |
||
57 |
def get_bundle(transport): |
|
58 |
return transport.get(filename) |
|
59 |
||
60 |
def redirected_transport(transport, exception, redirection_notice): |
|
61 |
note(redirection_notice) |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
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) |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
67 |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
68 |
try: |
69 |
f = do_catching_redirections(get_bundle, transport, |
|
70 |
redirected_transport) |
|
71 |
except errors.TooManyRedirections: |
|
72 |
raise errors.NotABundle(str(url)) |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
73 |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
74 |
if _do_directive: |
75 |
directive = MergeDirective.from_lines(f.readlines()) |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
76 |
return directive |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
77 |
else: |
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
78 |
return _serializer.read_bundle(f) |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
79 |
except (errors.TransportError, errors.PathError), e: |
80 |
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 |
81 |
except (IOError,), e: |
82 |
# jam 20060707
|
|
83 |
# Abstraction leakage, SFTPTransport.get('directory')
|
|
84 |
# doesn't always fail at get() time. Sometimes it fails
|
|
85 |
# during read. And that raises a generic IOError with
|
|
86 |
# just the string 'Failure'
|
|
87 |
# StubSFTPServer does fail during get() (because of prefetch)
|
|
88 |
# so it has an opportunity to translate the error.
|
|
89 |
raise errors.NotABundle(str(e)) |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
90 |
except errors.NotAMergeDirective: |
91 |
f.seek(0) |
|
1551.14.7
by Aaron Bentley
test suite fixes |
92 |
return _serializer.read_bundle(f) |