This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10086

dispatch: use detailed exit code 250 for keyboard interrupt
ClosedPublic

Authored by martinvonz on Mar 1 2021, 5:56 PM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG8e1d489142e8: dispatch: use detailed exit code 250 for keyboard interrupt
Summary

Among our users at Google, we're still seeing several percent of
commands fail with exit code 255. I suspect keyboard interrupts is an
important remaining reason.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz created this revision.Mar 1 2021, 5:56 PM
pulkit accepted this revision.Mar 2 2021, 4:02 AM
This revision is now accepted and ready to land.Mar 2 2021, 4:02 AM
martinvonz added a comment.Mar 2 2021, 12:38 PM

This broke test-chg.t on py2 because the exit code changed from 255 to 250. However, the problem is that it didn't break the test on py3. I'll have to figure out how to get the right exit code on py3 as well. I've dropped the commit for now.

Revision Contents
Changeset List

PathPackages
Mmercurial/dispatch.py (5 lines)
Mtests/test-commandserver.t (2 lines)

Diff 26018

mercurial/dispatch.py

req.ui.error(msg) req.ui.error(msg)
except error.SignalInterrupt: except error.SignalInterrupt:
# maybe pager would quit without consuming all the output, and # maybe pager would quit without consuming all the output, and
# SIGPIPE was raised. we cannot print anything in this case. # SIGPIPE was raised. we cannot print anything in this case.
pass pass
except IOError as inst: except IOError as inst:
if inst.errno != errno.EPIPE: if inst.errno != errno.EPIPE:
raise raise
if req.ui.configbool(b'ui', b'detailed-exit-code'):
ret = 250
else:
ret = -1 ret = -1
finally: finally:
duration = util.timer() - starttime duration = util.timer() - starttime
req.ui.flush() # record blocked times req.ui.flush() # record blocked times
if req.ui.logblockedtimes: if req.ui.logblockedtimes:
req.ui._blockedtimes[b'command_duration'] = duration * 1000 req.ui._blockedtimes[b'command_duration'] = duration * 1000
req.ui.log( req.ui.log(
b'uiblocked', b'uiblocked',
b'ui blocked ms\n', b'ui blocked ms\n',

tests/test-commandserver.t

... runcommand(server, [b'debugsuicide']) # command can be interrupted ... runcommand(server, [b'debugsuicide']) # command can be interrupted
... server.send_signal(signal.SIGTERM) # server will be terminated ... server.send_signal(signal.SIGTERM) # server will be terminated
... time.sleep(1) ... time.sleep(1)
*** runcommand debugsleep *** runcommand debugsleep
*** runcommand debugsleep *** runcommand debugsleep
*** runcommand debugsuicide *** runcommand debugsuicide
interrupted! interrupted!
killed! killed!
[255] [250]
#endif #endif
structured message channel: structured message channel:
$ cat <<'EOF' >> repo2/.hg/hgrc $ cat <<'EOF' >> repo2/.hg/hgrc
> [ui] > [ui]