/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/errors.py

  • Committer: Andrew Bennetts
  • Date: 2009-06-17 02:02:44 UTC
  • mfrom: (4449 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4452.
  • Revision ID: andrew.bennetts@canonical.com-20090617020244-50aantdf95aakvjx
Merge bzr.dev, resolving NEWS conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1173
1173
class DivergedBranches(BzrError):
1174
1174
 
1175
1175
    _fmt = ("These branches have diverged."
1176
 
            " Use the merge command to reconcile them.")
 
1176
            " Use the missing command to see how.\n"
 
1177
            "Use the merge command to reconcile them.")
1177
1178
 
1178
1179
    def __init__(self, branch1, branch2):
1179
1180
        self.branch1 = branch1
1227
1228
            not_ancestor_id=not_ancestor_id)
1228
1229
 
1229
1230
 
1230
 
class InstallFailed(BzrError):
1231
 
 
1232
 
    def __init__(self, revisions):
1233
 
        revision_str = ", ".join(str(r) for r in revisions)
1234
 
        msg = "Could not install revisions:\n%s" % revision_str
1235
 
        BzrError.__init__(self, msg)
1236
 
        self.revisions = revisions
1237
 
 
1238
 
 
1239
1231
class AmbiguousBase(BzrError):
1240
1232
 
1241
1233
    def __init__(self, bases):
2169
2161
    _fmt = "To use this feature you must upgrade your repository at %(path)s."
2170
2162
 
2171
2163
 
 
2164
class RichRootUpgradeRequired(UpgradeRequired):
 
2165
 
 
2166
    _fmt = ("To use this feature you must upgrade your branch at %(path)s to"
 
2167
           " a format which supports rich roots.")
 
2168
 
 
2169
 
2172
2170
class LocalRequiresBoundBranch(BzrError):
2173
2171
 
2174
2172
    _fmt = "Cannot perform local-only commits on unbound branches."
2960
2958
        BzrError.__init__(self, invalid_id=invalid_id)
2961
2959
 
2962
2960
 
 
2961
class JailBreak(BzrError):
 
2962
 
 
2963
    _fmt = "An attempt to access a url outside the server jail was made: '%(url)s'."
 
2964
 
 
2965
    def __init__(self, url):
 
2966
        BzrError.__init__(self, url=url)
 
2967
 
 
2968
 
2963
2969
class UserAbort(BzrError):
2964
2970
 
2965
2971
    _fmt = 'The user aborted the operation.'
3025
3031
 
3026
3032
    def __init__(self, repository):
3027
3033
        self.repository = repository
 
3034
 
 
3035
 
 
3036
class LossyPushToSameVCS(BzrError):
 
3037
 
 
3038
    _fmt = ("Lossy push not possible between %(source_branch)r and "
 
3039
            "%(target_branch)r that are in the same VCS.")
 
3040
 
 
3041
    internal_error = True
 
3042
 
 
3043
    def __init__(self, source_branch, target_branch):
 
3044
        self.source_branch = source_branch
 
3045
        self.target_branch = target_branch