This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1981

wireprotoserver: add some blank lines between methods
ClosedPublic

Authored by indygreg on Feb 1 2018, 6:11 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG49426bb4476c: wireprotoserver: add some blank lines between methods
rHG397c2a9ba553: wireprotoserver: add some blank lines between methods
Summary

Let's make this file slightly easier to read.

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, 6:11 PM
durin42 accepted this revision.Feb 1 2018, 6:22 PM
This revision is now accepted and ready to land.Feb 1 2018, 6:22 PM
Closed by commit rHG397c2a9ba553: wireprotoserver: add some blank lines between methods (authored by indygreg). · Explain WhyFeb 1 2018, 6:32 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (4 lines)

Diff 5119

mercurial/wireprotoserver.py

star = {} star = {}
for key in knownargs.keys(): for key in knownargs.keys():
if key != 'cmd' and key not in keys: if key != 'cmd' and key not in keys:
star[key] = knownargs[key][0] star[key] = knownargs[key][0]
data['*'] = star data['*'] = star
else: else:
data[k] = knownargs[k][0] data[k] = knownargs[k][0]
return [data[k] for k in keys] return [data[k] for k in keys]
def _args(self): def _args(self):
args = self.req.form.copy() args = self.req.form.copy()
if pycompat.ispy3: if pycompat.ispy3:
args = {k.encode('ascii'): [v.encode('ascii') for v in vs] args = {k.encode('ascii'): [v.encode('ascii') for v in vs]
for k, vs in args.items()} for k, vs in args.items()}
postlen = int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) postlen = int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0))
if postlen: if postlen:
args.update(cgi.parse_qs( args.update(cgi.parse_qs(
self.req.read(postlen), keep_blank_values=True)) self.req.read(postlen), keep_blank_values=True))
return args return args
argvalue = decodevaluefromheaders(self.req, r'X-HgArg') argvalue = decodevaluefromheaders(self.req, r'X-HgArg')
args.update(cgi.parse_qs(argvalue, keep_blank_values=True)) args.update(cgi.parse_qs(argvalue, keep_blank_values=True))
return args return args
def getfile(self, fp): def getfile(self, fp):
length = int(self.req.env[r'CONTENT_LENGTH']) length = int(self.req.env[r'CONTENT_LENGTH'])
# If httppostargs is used, we need to read Content-Length # If httppostargs is used, we need to read Content-Length
# minus the amount that was consumed by args. # minus the amount that was consumed by args.
length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0)) length -= int(self.req.env.get(r'HTTP_X_HGARGS_POST', 0))
for s in util.filechunkiter(self.req, limit=length): for s in util.filechunkiter(self.req, limit=length):
fp.write(s) fp.write(s)
def redirect(self): def redirect(self):
self.oldio = self.ui.fout, self.ui.ferr self.oldio = self.ui.fout, self.ui.ferr
self.ui.ferr = self.ui.fout = stringio() self.ui.ferr = self.ui.fout = stringio()
def restore(self): def restore(self):
val = self.ui.fout.getvalue() val = self.ui.fout.getvalue()
self.ui.ferr, self.ui.fout = self.oldio self.ui.ferr, self.ui.fout = self.oldio
return val return val
def _client(self): def _client(self):
return 'remote:%s:%s:%s' % ( return 'remote:%s:%s:%s' % (
self.req.env.get('wsgi.url_scheme') or 'http', self.req.env.get('wsgi.url_scheme') or 'http',