This is an archive of the discontinued Mercurial Phabricator instance.

Differential D962

hgweb: in protocol adapter, avoid control reaching end of non-void function
ClosedPublic

Authored by durin42 on Oct 5 2017, 5:31 PM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGe21f274cccea: hgweb: in protocol adapter, avoid control reaching end of non-void function
Summary

This greatly confounded some Python 3 porting work, once it was
managing to get this far.

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.Oct 5 2017, 5:31 PM
indygreg accepted this revision.Oct 6 2017, 9:33 AM
This revision is now accepted and ready to land.Oct 6 2017, 9:33 AM
Closed by commit rHGe21f274cccea: hgweb: in protocol adapter, avoid control reaching end of non-void function (authored by durin42). · Explain WhyOct 8 2017, 4:37 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/hgweb/protocol.py (2 lines)

Diff 2523

mercurial/hgweb/protocol.py

import cgi import cgi
import struct import struct
from .common import ( from .common import (
HTTP_OK, HTTP_OK,
) )
from .. import ( from .. import (
error,
util, util,
wireproto, wireproto,
) )
stringio = util.stringio stringio = util.stringio
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
p.restore() p.restore()
rsp = '0\n%s\n' % rsp.res rsp = '0\n%s\n' % rsp.res
req.respond(HTTP_OK, HGTYPE, body=rsp) req.respond(HTTP_OK, HGTYPE, body=rsp)
return [] return []
elif isinstance(rsp, wireproto.ooberror): elif isinstance(rsp, wireproto.ooberror):
rsp = rsp.message rsp = rsp.message
req.respond(HTTP_OK, HGERRTYPE, body=rsp) req.respond(HTTP_OK, HGERRTYPE, body=rsp)
return [] return []
raise error.ProgrammingError('hgweb.protocol internal failure', rsp)