bzr branch
http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar
|
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
|
26 |
from bzrlib.transport import get_transport as _get_transport
|
|
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
27 |
""") |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
28 |
|
29 |
||
30 |
def read_bundle_from_url(url): |
|
|
1551.14.7
by Aaron Bentley
test suite fixes |
31 |
return read_mergeable_from_url(url, _do_directive=False) |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
32 |
|
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
33 |
def read_mergeable_from_url(url, _do_directive=True): |
34 |
"""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 |
35 |
|
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
36 |
:return: An object supporting get_target_revision. Raises NotABundle if
|
37 |
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 |
38 |
"""
|
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
39 |
from bzrlib.merge_directive import MergeDirective |
|
2167.2.1
by Aaron Bentley
Fix reading bundles from http URLs |
40 |
url = urlutils.normalize_url(url) |
|
1996.3.8
by John Arbash Meinel
lazy_import bundle and bundle.commands |
41 |
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 |
42 |
if not filename: |
43 |
# A path to a directory was passed in
|
|
44 |
# definitely not a bundle
|
|
45 |
raise errors.NotABundle('A directory cannot be a bundle') |
|
46 |
||
47 |
# All of this must be in the try/except
|
|
48 |
# Some transports cannot detect that we are trying to read a
|
|
49 |
# directory until we actually issue read() on the handle.
|
|
50 |
try: |
|
|
2095.2.1
by John Arbash Meinel
Fix imports for bundles. |
51 |
t = _get_transport(url) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
52 |
f = t.get(filename) |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
53 |
if _do_directive: |
54 |
directive = MergeDirective.from_lines(f.readlines()) |
|
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
55 |
return directive |
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
56 |
else: |
|
1551.14.4
by Aaron Bentley
Change bundle reader and merge directive to both be 'mergeables' |
57 |
return _serializer.read_bundle(f) |
|
1711.3.2
by John Arbash Meinel
Add the read_bundle_from_url command, which handles lots of exceptions |
58 |
except (errors.TransportError, errors.PathError), e: |
59 |
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 |
60 |
except (IOError,), e: |
61 |
# jam 20060707
|
|
62 |
# Abstraction leakage, SFTPTransport.get('directory')
|
|
63 |
# doesn't always fail at get() time. Sometimes it fails
|
|
64 |
# during read. And that raises a generic IOError with
|
|
65 |
# just the string 'Failure'
|
|
66 |
# StubSFTPServer does fail during get() (because of prefetch)
|
|
67 |
# so it has an opportunity to translate the error.
|
|
68 |
raise errors.NotABundle(str(e)) |
|
|
1551.14.1
by Aaron Bentley
Allow pull from a merge directive |
69 |
except errors.NotAMergeDirective: |
70 |
f.seek(0) |
|
|
1551.14.7
by Aaron Bentley
test suite fixes |
71 |
return _serializer.read_bundle(f) |