This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1966

wireprotoserver: rename call to callhttp
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGa42455b3dbf8: wireprotoserver: rename call to callhttp
rHG86196f91fee8: wireprotoserver: rename call to callhttp
Summary

In the context of multiple handlers, call() is ambiguous.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

indygreg created this revision.Feb 1 2018, 3:19 PM
durin42 accepted this revision.Feb 1 2018, 5:44 PM
This revision is now accepted and ready to land.Feb 1 2018, 5:44 PM
Closed by commit rHG86196f91fee8: wireprotoserver: rename call to callhttp (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 5046

mercurial/hgweb/hgweb_mod.py

cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0]) cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0])
if wireprotoserver.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 wireprotoserver.call(rctx.repo, req, cmd) return wireprotoserver.callhttp(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()

mercurial/wireprotoserver.py

# setting a very high compression level could lead to flooding # setting a very high compression level could lead to flooding
# the server's network or CPU. # the server's network or CPU.
opts = {'level': self.ui.configint('server', 'zliblevel')} opts = {'level': self.ui.configint('server', 'zliblevel')}
return HGTYPE, util.compengines['zlib'], opts return HGTYPE, util.compengines['zlib'], opts
def iscmd(cmd): def iscmd(cmd):
return cmd in wireproto.commands return cmd in wireproto.commands
def call(repo, req, cmd): def callhttp(repo, req, cmd):
p = webproto(req, repo.ui) p = webproto(req, repo.ui)
def genversion2(gen, engine, engineopts): def genversion2(gen, engine, engineopts):
# application/mercurial-0.2 always sends a payload header # application/mercurial-0.2 always sends a payload header
# identifying the compression engine. # identifying the compression engine.
name = engine.wireprotosupport().name name = engine.wireprotosupport().name
assert 0 < len(name) < 256 assert 0 < len(name) < 256
yield struct.pack('B', len(name)) yield struct.pack('B', len(name))