This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9271

serve: simply return instead of calling sys.exit() in `hg serve --stdio`
ClosedPublic

Authored by martinvonz on Nov 3 2020, 11:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGd6279c43fc60: serve: simply return instead of calling sys.exit() in `hg serve --stdio`
Summary

The shouldn't be a reason to call sys.exit() instead of letting the
code return normally. I've remove the call in both hg serve and `hg
debugserve`.

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.Nov 3 2020, 11:44 PM
martinvonz added a commit: rHGd6279c43fc60: serve: simply return instead of calling sys.exit() in `hg serve --stdio`.Nov 4 2020, 8:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGd6279c43fc60: serve: simply return instead of calling sys.exit() in `hg serve --stdio` (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (2 lines)
Mmercurial/debugcommands.py (1 line)

Diff 23419

mercurial/commands.py

if opts[b"stdio"]: if opts[b"stdio"]:
if repo is None: if repo is None:
raise error.RepoError( raise error.RepoError(
_(b"there is no Mercurial repository here (.hg not found)") _(b"there is no Mercurial repository here (.hg not found)")
) )
s = wireprotoserver.sshserver(ui, repo) s = wireprotoserver.sshserver(ui, repo)
s.serve_forever() s.serve_forever()
sys.exit(0) return
service = server.createservice(ui, repo, opts) service = server.createservice(ui, repo, opts)
return server.runservice(opts, initfn=service.init, runfn=service.run) return server.runservice(opts, initfn=service.init, runfn=service.run)
@command( @command(
b'shelve', b'shelve',
[ [

mercurial/debugcommands.py

raise raise
# can't seek a pipe, so `ab` mode fails on py3 # can't seek a pipe, so `ab` mode fails on py3
logfh = os.fdopen(int(opts[b'logiofd']), 'wb', 0) logfh = os.fdopen(int(opts[b'logiofd']), 'wb', 0)
elif opts[b'logiofile']: elif opts[b'logiofile']:
logfh = open(opts[b'logiofile'], b'ab', 0) logfh = open(opts[b'logiofile'], b'ab', 0)
s = wireprotoserver.sshserver(ui, repo, logfh=logfh) s = wireprotoserver.sshserver(ui, repo, logfh=logfh)
s.serve_forever() s.serve_forever()
sys.exit(0)
@command(b'debugsetparents', [], _(b'REV1 [REV2]')) @command(b'debugsetparents', [], _(b'REV1 [REV2]'))
def debugsetparents(ui, repo, rev1, rev2=None): def debugsetparents(ui, repo, rev1, rev2=None):
"""manually set the parents of the current working directory """manually set the parents of the current working directory
This is useful for writing repository conversion tools, but should This is useful for writing repository conversion tools, but should
be used with care. For example, neither the working directory nor the be used with care. For example, neither the working directory nor the