comparison mercurial/hgweb/hgweb_mod.py @ 6945:2cfdabe235fb

hgweb: return content iterator instead of using write() callable

This is a new version of 4879468fa28f (which was backed out in 943f066c0d58),
with an extra line removed to fix problems with hg serve. hg's internal web
server contains checking if the app isn't trying to write more bytes than
specified by the Content-Length header. The first try still contained an old
line that wrote the response, so the response was sent twice.

6944:7e5f3480c45b

                content = webcommands.rawfile(self, req, tmpl)
            else:
                content = getattr(webcommands, cmd)(self, req, tmpl)
                req.respond(HTTP_OK, ctype)

            req.write(content)
            return []

        except revlog.LookupError, err:
            req.respond(HTTP_NOT_FOUND, ctype)
            msg = str(err)
            if 'manifest' not in msg:
                msg = 'revision not found: %s' % err.name
            req.write(tmpl('error', error=msg))
            return []
        except (RepoError, revlog.RevlogError), inst:
            req.respond(HTTP_SERVER_ERROR, ctype)
            req.write(tmpl('error', error=str(inst)))
            return []
        except ErrorResponse, inst:
            req.respond(inst.code, ctype)
            req.write(tmpl('error', error=inst.message))
            return []

    def templater(self, req):

        # determine scheme, port and server name
        # this is needed to create absolute urls

6945:2cfdabe235fb

                content = webcommands.rawfile(self, req, tmpl)
            else:
                content = getattr(webcommands, cmd)(self, req, tmpl)
                req.respond(HTTP_OK, ctype)

            return ''.join(content),

        except revlog.LookupError, err:
            req.respond(HTTP_NOT_FOUND, ctype)
            msg = str(err)
            if 'manifest' not in msg:
                msg = 'revision not found: %s' % err.name
            return ''.join(tmpl('error', error=msg)),
        except (RepoError, revlog.RevlogError), inst:
            req.respond(HTTP_SERVER_ERROR, ctype)
            return ''.join(tmpl('error', error=str(inst))),
        except ErrorResponse, inst:
            req.respond(inst.code, ctype)
            return ''.join(tmpl('error', error=inst.message)),

    def templater(self, req):

        # determine scheme, port and server name
        # this is needed to create absolute urls