This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2285

wireprotoserver: return to using iscmd() method
ClosedPublic

Authored by durin42 on Feb 15 2018, 5:31 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG72812ad205d1: wireprotoserver: return to using iscmd() method
Summary

This was teased out in part so remotefilelog could disable an old
protocol method over http. It got dropped accidentally in the recent
refactor, but the code was all still present so it's easy to support
for now.

I think once we land remotefilelog, we should probably inline this
function.

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

durin42 created this revision.Feb 15 2018, 5:31 PM
indygreg accepted this revision.Feb 15 2018, 6:21 PM
indygreg added a subscriber: indygreg.

FWIW, I plan to add a mechanism to @wireprotocommand to declare which protocols the command is enabled for. I'll likely have those patches within a week. But until then, we can restore this.

This revision is now accepted and ready to land.Feb 15 2018, 6:21 PM
Closed by commit rHG72812ad205d1: wireprotoserver: return to using iscmd() method (authored by durin42). · Explain WhyFeb 15 2018, 6:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (6 lines)

Diff 5773

mercurial/wireprotoserver.py

self._ui.ferr = olderr self._ui.ferr = olderr
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',
urlreq.quote(self._req.env.get('REMOTE_HOST', '')), urlreq.quote(self._req.env.get('REMOTE_HOST', '')),
urlreq.quote(self._req.env.get('REMOTE_USER', ''))) urlreq.quote(self._req.env.get('REMOTE_USER', '')))
# This method exists mostly so that extensions like remotefilelog can
# disable a kludgey legacy method only over http. As of early 2018,
# there are no other known users, so with any luck we can discard this
# hook if remotefilelog becomes a first-party extension.
def iscmd(cmd): def iscmd(cmd):
return cmd in wireproto.commands return cmd in wireproto.commands
def parsehttprequest(repo, req, query): def parsehttprequest(repo, req, query):
"""Parse the HTTP request for a wire protocol request. """Parse the HTTP request for a wire protocol request.
If the current request appears to be a wire protocol request, this If the current request appears to be a wire protocol request, this
function returns a dict with details about that request, including function returns a dict with details about that request, including
# The "cmd" request parameter is used by both the wire protocol and hgweb. # The "cmd" request parameter is used by both the wire protocol and hgweb.
# While not all wire protocol commands are available for all transports, # While not all wire protocol commands are available for all transports,
# if we see a "cmd" value that resembles a known wire protocol command, we # if we see a "cmd" value that resembles a known wire protocol command, we
# route it to a protocol handler. This is better than routing possible # route it to a protocol handler. This is better than routing possible
# wire protocol requests to hgweb because it prevents hgweb from using # wire protocol requests to hgweb because it prevents hgweb from using
# known wire protocol commands and it is less confusing for machine # known wire protocol commands and it is less confusing for machine
# clients. # clients.
if cmd not in wireproto.commands: if not iscmd(cmd):
return None return None
proto = httpv1protocolhandler(req, repo.ui) proto = httpv1protocolhandler(req, repo.ui)
return { return {
'cmd': cmd, 'cmd': cmd,
'proto': proto, 'proto': proto,
'dispatch': lambda: _callhttp(repo, req, proto, cmd), 'dispatch': lambda: _callhttp(repo, req, proto, cmd),