##// END OF EJS Templates
error: make ParseError inherit from HintException
timeless -
r27516:1c121618 default
parent child Browse files
Show More
@@ -107,6 +107,8 b' def dispatch(req):'
107 return -1
107 return -1
108 except error.ParseError as inst:
108 except error.ParseError as inst:
109 _formatparse(ferr.write, inst)
109 _formatparse(ferr.write, inst)
110 if inst.hint:
111 ferr.write(_("(%s)\n") % inst.hint)
110 return -1
112 return -1
111
113
112 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
114 msg = ' '.join(' ' in a and repr(a) or a for a in req.args)
@@ -202,6 +204,8 b' def _runcatch(req):'
202 (inst.args[0], " ".join(inst.args[1])))
204 (inst.args[0], " ".join(inst.args[1])))
203 except error.ParseError as inst:
205 except error.ParseError as inst:
204 _formatparse(ui.warn, inst)
206 _formatparse(ui.warn, inst)
207 if inst.hint:
208 ui.warn(_("(%s)\n") % inst.hint)
205 return -1
209 return -1
206 except error.LockHeld as inst:
210 except error.LockHeld as inst:
207 if inst.errno == errno.ETIMEDOUT:
211 if inst.errno == errno.ETIMEDOUT:
@@ -81,7 +81,7 b' class ResponseExpected(Abort):'
81 class OutOfBandError(HintException):
81 class OutOfBandError(HintException):
82 """Exception raised when a remote repo reports failure"""
82 """Exception raised when a remote repo reports failure"""
83
83
84 class ParseError(Exception):
84 class ParseError(HintException):
85 """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
85 """Raised when parsing config files and {rev,file}sets (msg[, pos])"""
86
86
87 class UnknownIdentifier(ParseError):
87 class UnknownIdentifier(ParseError):
General Comments 0
You need to be logged in to leave comments. Login now