D1982: wireprotoserver: rename p to proto
indygreg (Gregory Szorc)
phabricator at mercurial-scm.org
Thu Feb 1 23:11:52 UTC 2018
indygreg created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
To aid readability. And to make it easier to search the code base
for protocol instances.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D1982
AFFECTED FILES
mercurial/wireprotoserver.py
CHANGE DETAILS
diff --git a/mercurial/wireprotoserver.py b/mercurial/wireprotoserver.py
--- a/mercurial/wireprotoserver.py
+++ b/mercurial/wireprotoserver.py
@@ -194,7 +194,7 @@
return cmd in wireproto.commands
def callhttp(repo, req, cmd):
- p = webproto(req, repo.ui)
+ proto = webproto(req, repo.ui)
def genversion2(gen, engine, engineopts):
# application/mercurial-0.2 always sends a payload header
@@ -207,7 +207,7 @@
for chunk in gen:
yield chunk
- rsp = wireproto.dispatch(repo, p, cmd)
+ rsp = wireproto.dispatch(repo, proto, cmd)
if isinstance(rsp, bytes):
req.respond(HTTP_OK, HGTYPE, body=rsp)
return []
@@ -220,23 +220,24 @@
# This code for compression should not be streamres specific. It
# is here because we only compress streamres at the moment.
- mediatype, engine, engineopts = p.responsetype(rsp.prefer_uncompressed)
+ mediatype, engine, engineopts = proto.responsetype(
+ rsp.prefer_uncompressed)
gen = engine.compressstream(gen, engineopts)
if mediatype == HGTYPE2:
gen = genversion2(gen, engine, engineopts)
req.respond(HTTP_OK, mediatype)
return gen
elif isinstance(rsp, wireproto.pushres):
- val = p.restore()
+ val = proto.restore()
rsp = '%d\n%s' % (rsp.res, val)
req.respond(HTTP_OK, HGTYPE, body=rsp)
return []
elif isinstance(rsp, wireproto.pusherr):
# drain the incoming bundle
req.drain()
- p.restore()
+ proto.restore()
rsp = '0\n%s\n' % rsp.res
req.respond(HTTP_OK, HGTYPE, body=rsp)
return []
To: indygreg, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list