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 |
||
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
17 |
from bzrlib.lazy_import import lazy_import |
18 |
lazy_import(globals(), """ |
|
19 |
from bzrlib import (
|
|
20 |
errors,
|
|
21 |
urlutils,
|
|
22 |
)
|
|
2095.2.1
by John Arbash Meinel
Fix imports for bundles. |
23 |
from bzrlib.bundle import serializer as _serializer
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
24 |
from bzrlib.transport import (
|
25 |
do_catching_redirections,
|
|
26 |
get_transport,
|
|
27 |
)
|
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
28 |
""") |
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
29 |
from bzrlib.trace import note |
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
30 |
|
31 |
||
32 |
def read_bundle_from_url(url): |
|
1551.14.7
by Aaron Bentley
test suite fixes |
33 |
return read_mergeable_from_url(url, _do_directive=False) |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
34 |
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
35 |
|
3251.4.10
by Aaron Bentley
Pull of launchpad locations works (abentley, #181945) |
36 |
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' |
37 |
"""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 |
38 |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
39 |
:return: An object supporting get_target_revision. Raises NotABundle if
|
40 |
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 |
41 |
"""
|
3251.4.11
by Aaron Bentley
Fix wrong local lookups |
42 |
child_transport = get_transport(url, |
43 |
possible_transports=possible_transports) |
|
44 |
transport = child_transport.clone('..') |
|
45 |
filename = transport.relpath(child_transport.base) |
|
46 |
if filename.endswith('/'): |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
47 |
# A path to a directory was passed in
|
48 |
# definitely not a bundle
|
|
49 |
raise errors.NotABundle('A directory cannot be a bundle') |
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
50 |
mergeable, transport = read_mergeable_from_transport(transport, filename, |
51 |
_do_directive) |
|
52 |
return mergeable |
|
53 |
||
54 |
||
55 |
def read_mergeable_from_transport(transport, filename, _do_directive=True): |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
56 |
# All of this must be in the try/except
|
57 |
# Some transports cannot detect that we are trying to read a
|
|
58 |
# directory until we actually issue read() on the handle.
|
|
59 |
try: |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
60 |
def get_bundle(transport): |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
61 |
return transport.get(filename), transport |
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
62 |
|
63 |
def redirected_transport(transport, exception, redirection_notice): |
|
64 |
note(redirection_notice) |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
65 |
url, filename = urlutils.split(exception.target, |
66 |
exclude_trailing_slash=False) |
|
67 |
if not filename: |
|
68 |
raise errors.NotABundle('A directory cannot be a bundle') |
|
69 |
return get_transport(url) |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
70 |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
71 |
try: |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
72 |
f, transport = do_catching_redirections(get_bundle, transport, |
73 |
redirected_transport) |
|
2164.2.22
by Vincent Ladeuil
Take Aaron's review comments into account. |
74 |
except errors.TooManyRedirections: |
75 |
raise errors.NotABundle(str(url)) |
|
2164.2.21
by Vincent Ladeuil
Take bundles into account. |
76 |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
77 |
if _do_directive: |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
78 |
from bzrlib.merge_directive import MergeDirective |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
79 |
directive = MergeDirective.from_lines(f.readlines()) |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
80 |
return directive, transport |
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
81 |
else: |
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
82 |
return _serializer.read_bundle(f), transport |
3703.2.1
by Andrew Bennetts
Allow ConnectionReset to propagate from read_mergeable_from_url. |
83 |
except errors.ConnectionReset: |
84 |
raise
|
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
85 |
except (errors.TransportError, errors.PathError), e: |
86 |
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 |
87 |
except (IOError,), e: |
88 |
# jam 20060707
|
|
89 |
# Abstraction leakage, SFTPTransport.get('directory')
|
|
90 |
# doesn't always fail at get() time. Sometimes it fails
|
|
91 |
# during read. And that raises a generic IOError with
|
|
92 |
# just the string 'Failure'
|
|
93 |
# StubSFTPServer does fail during get() (because of prefetch)
|
|
94 |
# so it has an opportunity to translate the error.
|
|
95 |
raise errors.NotABundle(str(e)) |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
96 |
except errors.NotAMergeDirective: |
97 |
f.seek(0) |
|
2485.8.35
by Vincent Ladeuil
Fix pull multiple connections. |
98 |
return _serializer.read_bundle(f), transport |