This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1965

wireprotoserver: rename hgweb.protocol to wireprotoserver (API)
ClosedPublic

Authored by indygreg on Feb 1 2018, 3:19 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGef3a24a023ec: wireprotoserver: rename hgweb.protocol to wireprotoserver (API)
rHG1aa42928bb47: wireprotoserver: rename hgweb.protocol to wireprotoserver (API)
Summary

The HTTP wire protocol server / response handler is currently defined
in the hgweb sub-package. That only kind of makes sense. hgweb does
contain most of the HTTP server code. However, hgweb is more tailored
for providing HTTP server and WSGI scaffolding and serving hgweb
requests. The wire protocol is kind of its own beast.

In addition, the code for HTTP and SSH wire protocol handling is
actually pretty small and it needs to stay in sync to ensure parity
between the transport implementations.

We rename mercurial/hgweb/protocol.py to mercurial/wireprotoserver.py.
The new module will eventually become the home of the SSH handler
as well.

.. api::

Content from mercurial.hgweb.protocol has been moved to
mercurial.wireprotoserver.

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

indygreg created this revision.Feb 1 2018, 3:19 PM
durin42 accepted this revision.Feb 1 2018, 5:43 PM
This revision is now accepted and ready to land.Feb 1 2018, 5:43 PM
Closed by commit rHG1aa42928bb47: wireprotoserver: rename hgweb.protocol to wireprotoserver (API) (authored by indygreg). · Explain WhyFeb 1 2018, 5:56 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5090

mercurial/hgweb/hgweb_mod.py

hook, hook,
profiling, profiling,
pycompat, pycompat,
repoview, repoview,
templatefilters, templatefilters,
templater, templater,
ui as uimod, ui as uimod,
util, util,
wireprotoserver,
) )
from . import ( from . import (
protocol,
webcommands, webcommands,
webutil, webutil,
wsgicgi, wsgicgi,
) )
perms = { perms = {
'changegroup': 'pull', 'changegroup': 'pull',
'changegroupsubset': 'pull', 'changegroupsubset': 'pull',
query = req.env[r'QUERY_STRING'].partition(r'&')[0] query = req.env[r'QUERY_STRING'].partition(r'&')[0]
query = query.partition(r';')[0] query = query.partition(r';')[0]
# process this if it's a protocol request # process this if it's a protocol request
# protocol bits don't need to create any URLs # protocol bits don't need to create any URLs
# and the clients always use the old URL structure # and the clients always use the old URL structure
cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0]) cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0])
if protocol.iscmd(cmd): if wireprotoserver.iscmd(cmd):
try: try:
if query: if query:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
if cmd in perms: if cmd in perms:
self.check_perm(rctx, req, perms[cmd]) self.check_perm(rctx, req, perms[cmd])
return protocol.call(rctx.repo, req, cmd) return wireprotoserver.call(rctx.repo, req, cmd)
except ErrorResponse as inst: except ErrorResponse as inst:
# A client that sends unbundle without 100-continue will # A client that sends unbundle without 100-continue will
# break if we respond early. # break if we respond early.
if (cmd == 'unbundle' and if (cmd == 'unbundle' and
(req.env.get('HTTP_EXPECT', (req.env.get('HTTP_EXPECT',
'').lower() != '100-continue') or '').lower() != '100-continue') or
req.env.get('X-HgHttp2', '')): req.env.get('X-HgHttp2', '')):
req.drain() req.drain()
else: else:
req.headers.append((r'Connection', r'Close')) req.headers.append((r'Connection', r'Close'))
req.respond(inst, protocol.HGTYPE, req.respond(inst, wireprotoserver.HGTYPE,
body='0\n%s\n' % inst) body='0\n%s\n' % inst)
return '' return ''
# translate user-visible url structure to internal structure # translate user-visible url structure to internal structure
args = query.split('/', 2) args = query.split('/', 2)
if r'cmd' not in req.form and args and args[0]: if r'cmd' not in req.form and args and args[0]:
cmd = args.pop(0) cmd = args.pop(0)

mercurial/hgweb/protocol.py

  • This file was moved to mercurial/wireprotoserver.py.

mercurial/wireprotoserver.py

  • This file was moved from mercurial/hgweb/protocol.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 cgi import cgi
import struct import struct
from .common import ( from .hgweb.common import (
HTTP_OK, HTTP_OK,
) )
from . import (
from .. import (
error, error,
pycompat, pycompat,
util, util,
wireproto, wireproto,
) )
stringio = util.stringio stringio = util.stringio
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
HGTYPE = 'application/mercurial-0.1' HGTYPE = 'application/mercurial-0.1'
HGTYPE2 = 'application/mercurial-0.2' HGTYPE2 = 'application/mercurial-0.2'
HGERRTYPE = 'application/hg-error' HGERRTYPE = 'application/hg-error'