This is an archive of the discontinued Mercurial Phabricator instance.

Differential D3446

dispatch: move sys.exit() to caller (API)
AcceptedPublic

Authored by indygreg on May 6 2018, 12:11 AM.

Details

Reviewers
lothiraldan
durin42
Group Reviewers
hg-reviewers
Summary

Moving sys.exit() to the caller will make it easier to implement
exit handling in Rust hg by eliminating the need to handle
SystemExit in Rust.

.. api::

dispatch.run() now returns an integer exit code instead of calling
sys.exit(). Callers of dispatch.run() must now exit.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.May 6 2018, 12:11 AM
lothiraldan accepted this revision.May 7 2018, 3:11 AM
indygreg updated this revision to Diff 8655.May 12 2018, 12:48 AM
durin42 accepted this revision.May 31 2018, 3:07 PM
This revision is now accepted and ready to land.May 31 2018, 3:07 PM

Revision Contents
Changeset List

PathPackages
Mcontrib/hgperf (2 lines)
Mhg (2 lines)
Mmercurial/dispatch.py (2 lines)

Diff 8655

contrib/hgperf

lui.pushbuffer() lui.pushbuffer()
timer(lambda : orgruncommand(lui, repo, cmd, fullargs, ui, timer(lambda : orgruncommand(lui, repo, cmd, fullargs, ui,
options, d, cmdpats, cmdoptions)) options, d, cmdpats, cmdoptions))
ui.popbuffer() ui.popbuffer()
lui.popbuffer() lui.popbuffer()
dispatch.runcommand = runcommand dispatch.runcommand = runcommand
dispatch.run() sys.exit(dispatch.run())

hg

import hgdemandimport; hgdemandimport.enable() import hgdemandimport; hgdemandimport.enable()
except ImportError: except ImportError:
sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" % sys.stderr.write("abort: couldn't find mercurial libraries in [%s]\n" %
' '.join(sys.path)) ' '.join(sys.path))
sys.stderr.write("(check your install and PYTHONPATH)\n") sys.stderr.write("(check your install and PYTHONPATH)\n")
sys.exit(-1) sys.exit(-1)
from mercurial import dispatch from mercurial import dispatch
dispatch.run() sys.exit(dispatch.run())

mercurial/dispatch.py

encoding.strtolocal(err.strerror)) encoding.strtolocal(err.strerror))
req.ui.ferr.flush() req.ui.ferr.flush()
# There's not much we can do about an I/O error here. So (possibly) # There's not much we can do about an I/O error here. So (possibly)
# change the status code and move on. # change the status code and move on.
except IOError: except IOError:
status = -1 status = -1
_silencestdio() _silencestdio()
sys.exit(status & 255) return status & 255
if pycompat.ispy3: if pycompat.ispy3:
def initstdio(): def initstdio():
pass pass
def _silencestdio(): def _silencestdio():
for fp in (sys.stdout, sys.stderr): for fp in (sys.stdout, sys.stderr):
# Check if the file is okay # Check if the file is okay