Mercurial > hg
comparison mercurial/dispatch.py @ 49005:12adf8c695ed
merge: stable into default
author | Raphaël Gomès <rgomes@octobus.net> |
---|---|
date | Tue, 05 Apr 2022 11:09:03 +0200 |
parents | 642e31cb55f0 91a60031aba2 |
children | 48f1b314056b |
comparison
equal
deleted
inserted
replaced
48997:20c6c9e43397 | 49005:12adf8c695ed |
---|---|
267 req.ui.fmsg = req.fmsg | 267 req.ui.fmsg = req.fmsg |
268 except error.Abort as inst: | 268 except error.Abort as inst: |
269 ferr.write(inst.format()) | 269 ferr.write(inst.format()) |
270 return -1 | 270 return -1 |
271 | 271 |
272 msg = _formatargs(req.args) | 272 formattedargs = _formatargs(req.args) |
273 starttime = util.timer() | 273 starttime = util.timer() |
274 ret = 1 # default of Python exit code on unhandled exception | 274 ret = 1 # default of Python exit code on unhandled exception |
275 try: | 275 try: |
276 ret = _runcatch(req) or 0 | 276 ret = _runcatch(req) or 0 |
277 except error.ProgrammingError as inst: | 277 except error.ProgrammingError as inst: |
306 ) | 306 ) |
307 return_code = ret & 255 | 307 return_code = ret & 255 |
308 req.ui.log( | 308 req.ui.log( |
309 b"commandfinish", | 309 b"commandfinish", |
310 b"%s exited %d after %0.2f seconds\n", | 310 b"%s exited %d after %0.2f seconds\n", |
311 msg, | 311 formattedargs, |
312 return_code, | 312 return_code, |
313 duration, | 313 duration, |
314 return_code=return_code, | 314 return_code=return_code, |
315 duration=duration, | 315 duration=duration, |
316 canonical_command=req.canonical_command, | 316 canonical_command=req.canonical_command, |