Mercurial > public > mercurial-scm > hg
comparison mercurial/worker.py @ 45825:8f07f5a9c3de
worker: raise exception instead of calling sys.exit() with child's code
When a worker process returns an error code, we would call
`sys.exit()` with that exit code on the main process. The `SystemExit`
exception would then get caught in `scmutil.callcatch()`, which would
return that error code. The comment there says "Commands shouldn't
sys.exit directly", which I agree with. This patch changes it so we
raise a specific exception when a worker fails so we can catch
instead. I think that means that `SystemExit` is now always an
internal error.
(I had earlier thought that this call to `sys.exit()` was from within
the child process until Matt Harbison made me look again, so thanks
for that!)
Differential Revision: https://phab.mercurial-scm.org/D9287
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Sat, 07 Nov 2020 21:50:28 -0800 |
parents | 7d24201b6447 |
children | 89a2afe31e82 |
comparison
equal
deleted
inserted
replaced
45824:9ac96b9fa76e | 45825:8f07f5a9c3de |
---|---|
298 raise | 298 raise |
299 status = cleanup() | 299 status = cleanup() |
300 if status: | 300 if status: |
301 if status < 0: | 301 if status < 0: |
302 os.kill(os.getpid(), -status) | 302 os.kill(os.getpid(), -status) |
303 sys.exit(status) | 303 raise error.WorkerError(status) |
304 if hasretval: | 304 if hasretval: |
305 yield True, retval | 305 yield True, retval |
306 | 306 |
307 | 307 |
308 def _posixexitstatus(code): | 308 def _posixexitstatus(code): |