Mercurial > hg
changeset 48998:91a60031aba2 stable
dispatch: fix silly blackbox entries when hg is interrupted
When hg is interrupted, it creates ui.log like this:
1970/01/01 00:00:00 user @0000000000000000000000000000000000000000 (62488)> killed!
exited 255 after 1.78 seconds
This is due to a scoping problem: two different uses of the name "msg"
collide. So rename one of them.
Differential Revision: https://phab.mercurial-scm.org/D12427
| author | Valentin Gatien-Baron <vgatien-baron@janestreet.com> |
|---|---|
| date | Fri, 01 Apr 2022 12:46:58 -0400 |
| parents | d4752aeb20f1 |
| children | cfd270d83169 |
| files | mercurial/dispatch.py |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/dispatch.py Fri Jul 23 13:42:12 2021 +0530 +++ b/mercurial/dispatch.py Fri Apr 01 12:46:58 2022 -0400 @@ -287,7 +287,7 @@ ferr.write(inst.format()) return -1 - msg = _formatargs(req.args) + formattedargs = _formatargs(req.args) starttime = util.timer() ret = 1 # default of Python exit code on unhandled exception try: @@ -326,7 +326,7 @@ req.ui.log( b"commandfinish", b"%s exited %d after %0.2f seconds\n", - msg, + formattedargs, return_code, duration, return_code=return_code,