This is an archive of the discontinued Mercurial Phabricator instance.

Differential D12427

dispatch: fix silly blackbox entries when hg is interrupted
ClosedPublic

Authored by valentin.gatienbaron on Apr 1 2022, 12:47 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG91a60031aba2: dispatch: fix silly blackbox entries when hg is interrupted
Summary

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.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

valentin.gatienbaron retitled this revision from dispatch: stop sometimes generating silly blackbox entries to dispatch: fix silly blackbox entries when hg is interrupted.Apr 1 2022, 12:48 PM
Alphare accepted this revision.Apr 4 2022, 11:10 AM
Alphare added a subscriber: Alphare.

Queuing this for stable

This revision is now accepted and ready to land.Apr 4 2022, 11:10 AM

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (4 lines)

Diff 32741

mercurial/dispatch.py

if req.ferr: if req.ferr:
req.ui.ferr = req.ferr req.ui.ferr = req.ferr
if req.fmsg: if req.fmsg:
req.ui.fmsg = req.fmsg req.ui.fmsg = req.fmsg
except error.Abort as inst: except error.Abort as inst:
ferr.write(inst.format()) ferr.write(inst.format())
return -1 return -1
msg = _formatargs(req.args) formattedargs = _formatargs(req.args)
starttime = util.timer() starttime = util.timer()
ret = 1 # default of Python exit code on unhandled exception ret = 1 # default of Python exit code on unhandled exception
try: try:
ret = _runcatch(req) or 0 ret = _runcatch(req) or 0
except error.ProgrammingError as inst: except error.ProgrammingError as inst:
req.ui.error(_(b'** ProgrammingError: %s\n') % inst) req.ui.error(_(b'** ProgrammingError: %s\n') % inst)
if inst.hint: if inst.hint:
req.ui.error(_(b'** (%s)\n') % inst.hint) req.ui.error(_(b'** (%s)\n') % inst.hint)
b'uiblocked', b'uiblocked',
b'ui blocked ms\n', b'ui blocked ms\n',
**pycompat.strkwargs(req.ui._blockedtimes) **pycompat.strkwargs(req.ui._blockedtimes)
) )
return_code = ret & 255 return_code = ret & 255
req.ui.log( req.ui.log(
b"commandfinish", b"commandfinish",
b"%s exited %d after %0.2f seconds\n", b"%s exited %d after %0.2f seconds\n",
msg, formattedargs,
return_code, return_code,
duration, duration,
return_code=return_code, return_code=return_code,
duration=duration, duration=duration,
canonical_command=req.canonical_command, canonical_command=req.canonical_command,
) )
try: try:
req._runexithandlers() req._runexithandlers()