/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/push.py

  • Committer: Jelmer Vernooij
  • Date: 2010-03-21 21:39:33 UTC
  • mfrom: (5102 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5143.
  • Revision ID: jelmer@samba.org-20100321213933-fexeh9zcoz8oaju2
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/push.py
1
 
# Copyright (C) 2008 Canonical Ltd
 
1
# Copyright (C) 2008, 2009, 2010 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
110
110
                    "\nYou may supply --create-prefix to create all"
111
111
                    " leading parent directories."
112
112
                    % location)
 
113
            # This shouldn't occur (because create_prefix is true, so
 
114
            # create_clone_on_transport should be catching NoSuchFile and
 
115
            # creating the missing directories) but if it does the original
 
116
            # NoSuchFile error will be more informative than an
 
117
            # UnboundLocalError for br_to.
 
118
            raise
113
119
        except errors.TooManyRedirections:
114
120
            raise errors.BzrCommandError("Too many redirections trying "
115
121
                                         "to make %s." % location)
137
143
            raise errors.BzrCommandError('These branches have diverged.'
138
144
                                    '  See "bzr help diverged-branches"'
139
145
                                    ' for more information.')
 
146
        except errors.NoRoundtrippingSupport, e:
 
147
            raise errors.BzrCommandError("It is not possible to losslessly "
 
148
                "push to %s. You may want to use dpush instead." % 
 
149
                    e.target_branch.mapping.vcs.abbreviation)
140
150
        except errors.NoRepositoryPresent:
141
151
            # we have a bzrdir but no branch or repository
142
152
            # XXX: Figure out what to do other than complain.