This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9270

httpservice: move sys.exit() out of serve_forever()
ClosedPublic

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

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHGb7b8a1538161: httpservice: move sys.exit() out of serve_forever()
Summary

This is a simple refactoring to show the callers of the method, so
it's easier to reason about the impact of removing the sys.exit()
calls in subsequent patches.

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: rHGb7b8a1538161: httpservice: move sys.exit() out of serve_forever().Nov 4 2020, 8:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGb7b8a1538161: httpservice: move sys.exit() out of serve_forever() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 23418

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)
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

mercurial/hgweb/__init__.py

# hgweb/__init__.py - web interface to a mercurial repository # hgweb/__init__.py - web interface to a mercurial repository
# #
# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005 Matt Mackall <mpm@selenic.com> # Copyright 2005 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import os import os
import sys
from ..i18n import _ from ..i18n import _
from .. import ( from .. import (
error, error,
pycompat, pycompat,
) )
write( write(
_(b'listening at %s (bound to %s:%d)\n') _(b'listening at %s (bound to %s:%d)\n')
% (url, pycompat.sysbytes(bindaddr), self.httpd.port) % (url, pycompat.sysbytes(bindaddr), self.httpd.port)
) )
self.ui.flush() # avoid buffering of status message self.ui.flush() # avoid buffering of status message
def run(self): def run(self):
self.httpd.serve_forever() self.httpd.serve_forever()
sys.exit(0)
def createapp(baseui, repo, webconf): def createapp(baseui, repo, webconf):
if webconf: if webconf:
return hgwebdir_mod.hgwebdir(webconf, baseui=baseui) return hgwebdir_mod.hgwebdir(webconf, baseui=baseui)
else: else:
if not repo: if not repo:
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)")
) )
return hgweb_mod.hgweb(repo, baseui=baseui) return hgweb_mod.hgweb(repo, baseui=baseui)

mercurial/wireprotoserver.py

# Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net> # Copyright 21 May 2005 - (c) 2005 Jake Edge <jake@edge2.net>
# Copyright 2005-2007 Matt Mackall <mpm@selenic.com> # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
# #
# This software may be used and distributed according to the terms of the # This software may be used and distributed according to the terms of the
# GNU General Public License version 2 or any later version. # GNU General Public License version 2 or any later version.
from __future__ import absolute_import from __future__ import absolute_import
import contextlib import contextlib
import struct import struct
import sys
import threading import threading
from .i18n import _ from .i18n import _
from . import ( from . import (
encoding, encoding,
error, error,
pycompat, pycompat,
util, util,
) )
ui.ferr = util.makeloggingfileobject( ui.ferr = util.makeloggingfileobject(
logfh, ui.ferr, b'e', logdata=True logfh, ui.ferr, b'e', logdata=True
) )
def serve_forever(self): def serve_forever(self):
self.serveuntil(threading.Event()) self.serveuntil(threading.Event())
self._ui.restorefinout(self._fin, self._fout) self._ui.restorefinout(self._fin, self._fout)
sys.exit(0)
def serveuntil(self, ev): def serveuntil(self, ev):
"""Serve until a threading.Event is set.""" """Serve until a threading.Event is set."""
_runsshserver(self._ui, self._repo, self._fin, self._fout, ev) _runsshserver(self._ui, self._repo, self._fin, self._fout, ev)