| durin42 |
| hg-reviewers |
Now that both functions are using the same API, we can unify how
the command is called and perform command-specific behavior in the
command itself instead of in the high-level router.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/hgweb/hgweb_mod.py (6 lines) | |||
| M | mercurial/hgweb/webcommands.py (3 lines) |
| raise ErrorResponse(HTTP_NOT_MODIFIED) | raise ErrorResponse(HTTP_NOT_MODIFIED) | ||||
| wsgireq.headers.append((r'ETag', pycompat.sysstr(tag))) | wsgireq.headers.append((r'ETag', pycompat.sysstr(tag))) | ||||
| res.headers['ETag'] = tag | res.headers['ETag'] = tag | ||||
| if cmd not in webcommands.__all__: | if cmd not in webcommands.__all__: | ||||
| msg = 'no such method: %s' % cmd | msg = 'no such method: %s' % cmd | ||||
| raise ErrorResponse(HTTP_BAD_REQUEST, msg) | raise ErrorResponse(HTTP_BAD_REQUEST, msg) | ||||
| elif cmd == 'file' and req.qsparams.get('style') == 'raw': | |||||
| res.status = '200 Script output follows' | |||||
| res.headers['Content-Type'] = ctype | |||||
| content = webcommands.rawfile(rctx, wsgireq, tmpl) | |||||
| assert content is res | |||||
| return res.sendresponse() | |||||
| else: | else: | ||||
| # Set some globals appropriate for web handlers. Commands can | # Set some globals appropriate for web handlers. Commands can | ||||
| # override easily enough. | # override easily enough. | ||||
| res.status = '200 Script output follows' | res.status = '200 Script output follows' | ||||
| res.headers['Content-Type'] = ctype | res.headers['Content-Type'] = ctype | ||||
| content = getattr(webcommands, cmd)(rctx, wsgireq, tmpl) | content = getattr(webcommands, cmd)(rctx, wsgireq, tmpl) | ||||
| if content is res: | if content is res: | ||||
| handler. | handler. | ||||
| If ``path`` is a file, information about that file will be shown via | If ``path`` is a file, information about that file will be shown via | ||||
| the ``filerevision`` template. | the ``filerevision`` template. | ||||
| If ``path`` is not defined, information about the root directory will | If ``path`` is not defined, information about the root directory will | ||||
| be rendered. | be rendered. | ||||
| """ | """ | ||||
| if web.req.qsparams.get('style') == 'raw': | |||||
| return rawfile(web, req, tmpl) | |||||
| path = webutil.cleanpath(web.repo, req.req.qsparams.get('file', '')) | path = webutil.cleanpath(web.repo, req.req.qsparams.get('file', '')) | ||||
| if not path: | if not path: | ||||
| return manifest(web, req, tmpl) | return manifest(web, req, tmpl) | ||||
| try: | try: | ||||
| return _filerevision(web, req, tmpl, webutil.filectx(web.repo, req)) | return _filerevision(web, req, tmpl, webutil.filectx(web.repo, req)) | ||||
| except error.LookupError as inst: | except error.LookupError as inst: | ||||
| try: | try: | ||||
| return manifest(web, req, tmpl) | return manifest(web, req, tmpl) | ||||