diff -r 69d7fcd91696 -r ef3a24a023ec mercurial/hgweb/hgweb_mod.py --- a/mercurial/hgweb/hgweb_mod.py Wed Jan 31 22:20:59 2018 -0800 +++ b/mercurial/hgweb/hgweb_mod.py Wed Jan 31 11:09:07 2018 -0800 @@ -36,10 +36,10 @@ templater, ui as uimod, util, + wireprotoserver, ) from . import ( - protocol, webcommands, webutil, wsgicgi, @@ -362,13 +362,13 @@ # and the clients always use the old URL structure cmd = pycompat.sysbytes(req.form.get(r'cmd', [r''])[0]) - if protocol.iscmd(cmd): + if wireprotoserver.iscmd(cmd): try: if query: raise ErrorResponse(HTTP_NOT_FOUND) if cmd in perms: self.check_perm(rctx, req, perms[cmd]) - return protocol.call(rctx.repo, req, cmd) + return wireprotoserver.call(rctx.repo, req, cmd) except ErrorResponse as inst: # A client that sends unbundle without 100-continue will # break if we respond early. @@ -379,7 +379,7 @@ req.drain() else: req.headers.append((r'Connection', r'Close')) - req.respond(inst, protocol.HGTYPE, + req.respond(inst, wireprotoserver.HGTYPE, body='0\n%s\n' % inst) return ''