This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2716

wireprotoserver: check if command available before calling it
ClosedPublic

Authored by indygreg on Mar 7 2018, 7:24 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG7574c8173d5e: wireprotoserver: check if command available before calling it
Summary

The previous behavior was just plain wrong. I have no clue how it
landed. My guess is a merge conflict resolution gone wrong on my
end a few weeks ago.

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.Mar 7 2018, 7:24 PM
durin42 accepted this revision.Mar 9 2018, 1:48 PM
This revision is now accepted and ready to land.Mar 9 2018, 1:48 PM
Closed by commit rHG7574c8173d5e: wireprotoserver: check if command available before calling it (authored by indygreg). · Explain WhyMar 9 2018, 2:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotoserver.py (4 lines)

Diff 6770

mercurial/wireprotoserver.py

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))
yield name yield name
for chunk in gen: for chunk in gen:
yield chunk yield chunk
rsp = wireproto.dispatch(repo, proto, cmd)
if not wireproto.commands.commandavailable(cmd, proto): if not wireproto.commands.commandavailable(cmd, proto):
req.respond(HTTP_OK, HGERRTYPE, req.respond(HTTP_OK, HGERRTYPE,
body=_('requested wire protocol command is not available ' body=_('requested wire protocol command is not available '
'over HTTP')) 'over HTTP'))
return [] return []
rsp = wireproto.dispatch(repo, proto, cmd)
if isinstance(rsp, bytes): if isinstance(rsp, bytes):
req.respond(HTTP_OK, HGTYPE, body=rsp) req.respond(HTTP_OK, HGTYPE, body=rsp)
return [] return []
elif isinstance(rsp, wireprototypes.bytesresponse): elif isinstance(rsp, wireprototypes.bytesresponse):
req.respond(HTTP_OK, HGTYPE, body=rsp.data) req.respond(HTTP_OK, HGTYPE, body=rsp.data)
return [] return []
elif isinstance(rsp, wireprototypes.streamreslegacy): elif isinstance(rsp, wireprototypes.streamreslegacy):
gen = rsp.gen gen = rsp.gen