This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9272

hgweb: don't call sys.exit() in httpservice.run()
ClosedPublic

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

Details

Reviewers
mharbison72
Group Reviewers
hg-reviewers
Commits
rHGee826f43cf4f: hgweb: don't call sys.exit() in httpservice.run()
Summary

If I'm reading the code correctly, mercurial.server.createservice()
can return an hgweb service or one of three types of command server
services. The caller then calls mercurial.server.runservice(),
passing it the returned service's run method. Only the hgweb service
was calling sys.exit(). It has been that way since 8d44649df03b
(refactor ssh server., 2006-06-04). That commit message doesn't
provide any explanation. Let's clean up and have the code follow the
usual return path into the dispatch module.

After this patch, there should be no remaining places left where we
call sys.exit() except for valid uses in the dispatch and worker
modules.

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
mharbison72 accepted this revision.Nov 4 2020, 7:53 PM
mharbison72 added a subscriber: mharbison72.

Will queue to here when I figure out how to push, thanks.

mercurial/hgweb/__init__.py
115

Dropped the unused import.

martinvonz added a commit: rHGee826f43cf4f: hgweb: don't call sys.exit() in httpservice.run().Nov 4 2020, 8:29 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHGee826f43cf4f: hgweb: don't call sys.exit() in httpservice.run() (authored by martinvonz). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/__init__.py (2 lines)

Diff 23420

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)
mharbison72Unsubmitted
Not Done

Dropped the unused import.

mharbison72: Dropped the unused import.
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)