/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: 2008-05-07 22:47:56 UTC
  • mfrom: (3412 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3414.
  • Revision ID: andrew.bennetts@canonical.com-20080507224756-upxgmud0bdo4ysuf
Merge from bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/errors.py
894
894
        self.obj = obj
895
895
 
896
896
 
897
 
class ReadOnlyLockError(LockError):
898
 
 
899
 
    _fmt = "Cannot acquire write lock on %(fname)s. %(msg)s"
900
 
 
901
 
    @symbol_versioning.deprecated_method(symbol_versioning.zero_ninetytwo)
902
 
    def __init__(self, fname, msg):
903
 
        LockError.__init__(self, '')
904
 
        self.fname = fname
905
 
        self.msg = msg
906
 
 
907
 
 
908
897
class LockFailed(LockError):
909
898
 
910
899
    internal_error = False
1066
1055
        BzrError.__init__(self, branch=branch, revision=revision)
1067
1056
 
1068
1057
 
1069
 
# zero_ninetyone: this exception is no longer raised and should be removed
1070
 
class NotLeftParentDescendant(InternalBzrError):
1071
 
 
1072
 
    _fmt = ("Revision %(old_revision)s is not the left parent of"
1073
 
            " %(new_revision)s, but branch %(branch_location)s expects this")
1074
 
 
1075
 
    def __init__(self, branch, old_revision, new_revision):
1076
 
        BzrError.__init__(self, branch_location=branch.base,
1077
 
                          old_revision=old_revision,
1078
 
                          new_revision=new_revision)
1079
 
 
1080
 
 
1081
1058
class RangeInChangeOption(BzrError):
1082
1059
 
1083
1060
    _fmt = "Option --change does not accept revision ranges"
2690
2667
        self.path = path
2691
2668
        self.kind = kind
2692
2669
        self.user_encoding = osutils.get_user_encoding()
 
2670
 
 
2671
 
 
2672
class CannotBindAddress(BzrError):
 
2673
 
 
2674
    _fmt = 'Cannot bind address "%(host)s:%(port)i": %(orig_error)s.'
 
2675
 
 
2676
    def __init__(self, host, port, orig_error):
 
2677
        BzrError.__init__(self, host=host, port=port,
 
2678
            orig_error=orig_error[1])