← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/errors.py

  • Committer: Vincent Ladeuil
  • Date: 2011-06-27 15:42:09 UTC
  • mfrom: (5993 +trunk)
  • mto: (5993.1.1 trunk)
  • mto: This revision was merged to the branch mainline in revision 5994.
  • Revision ID: v.ladeuil+lp@free.fr-20110627154209-azubuhbuxsz109hq
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
1770
1770
    _fmt = "Working tree has conflicts."
1771
1771
 
1772
1772
 
 
1773
class ConfigContentError(BzrError):
 
1774
 
 
1775
    _fmt = "Config file %(filename)s is not UTF-8 encoded\n"
 
1776
 
 
1777
    def __init__(self, filename):
 
1778
        BzrError.__init__(self)
 
1779
        self.filename = filename
 
1780
 
 
1781
 
1773
1782
class ParseConfigError(BzrError):
1774
1783
 
1775
1784
    _fmt = "Error(s) parsing config file %(filename)s:\n%(errors)s"
3081
3090
    _fmt = "Shelf corrupt."
3082
3091
 
3083
3092
 
 
3093
class DecompressCorruption(BzrError):
 
3094
 
 
3095
    _fmt = "Corruption while decompressing repository file%(orig_error)s"
 
3096
 
 
3097
    def __init__(self, orig_error=None):
 
3098
        if orig_error is not None:
 
3099
            self.orig_error = ", %s" % (orig_error,)
 
3100
        else:
 
3101
            self.orig_error = ""
 
3102
        BzrError.__init__(self)
 
3103
 
 
3104
 
3084
3105
class NoSuchShelfId(BzrError):
3085
3106
 
3086
3107
    _fmt = 'No changes are shelved with id "%(shelf_id)d".'