← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/__init__.py

  • Committer: John Arbash Meinel
  • Author(s): Mark Hammond
  • Date: 2008-09-09 17:02:21 UTC
  • mto: This revision was merged to the branch mainline in revision 3697.
  • Revision ID: john@arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
An updated transparent icon for bzr.

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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
 
 
17
 
from bzrlib.symbol_versioning import deprecated_function, deprecated_in
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
16
 
 
17
from StringIO import StringIO
 
18
 
18
19
from bzrlib.lazy_import import lazy_import
19
20
lazy_import(globals(), """
20
21
from bzrlib import (
30
31
from bzrlib.trace import note
31
32
 
32
33
 
33
 
@deprecated_function(deprecated_in((1, 12, 0)))
34
34
def read_bundle_from_url(url):
35
35
    return read_mergeable_from_url(url, _do_directive=False)
36
36
 
45
45
        possible_transports=possible_transports)
46
46
    transport = child_transport.clone('..')
47
47
    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')
48
52
    mergeable, transport = read_mergeable_from_transport(transport, filename,
49
53
                                                         _do_directive)
50
54
    return mergeable
70
74
            f, transport = do_catching_redirections(get_bundle, transport,
71
75
                                                    redirected_transport)
72
76
        except errors.TooManyRedirections:
73
 
            raise errors.NotABundle(transport.clone(filename).base)
 
77
            raise errors.NotABundle(str(url))
74
78
 
75
79
        if _do_directive:
76
80
            from bzrlib.merge_directive import MergeDirective
78
82
            return directive, transport
79
83
        else:
80
84
            return _serializer.read_bundle(f), transport
81
 
    except (errors.ConnectionReset, errors.ConnectionError), e:
82
 
        raise
83
85
    except (errors.TransportError, errors.PathError), e:
84
86
        raise errors.NotABundle(str(e))
85
87
    except (IOError,), e:
88
90
        # doesn't always fail at get() time. Sometimes it fails
89
91
        # during read. And that raises a generic IOError with
90
92
        # just the string 'Failure'
91
 
        # StubSFTPServer does fail during get() (because of prefetch)
 
93
        # StubSFTPServer does fail during get() (because of prefetch) 
92
94
        # so it has an opportunity to translate the error.
93
95
        raise errors.NotABundle(str(e))
94
96
    except errors.NotAMergeDirective: