This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2787

hgweb: port most @webcommand to use modern response type
ClosedPublic

Authored by indygreg on Mar 11 2018, 12:23 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9fc3d814646e: hgweb: port most @webcommand to use modern response type
Summary

This only focused on porting the return value.

raw file requests are wonky because they go through a separate code
path at the dispatch layer. Now that everyone is using the same
API, we could clean this up.

It's worth noting that wsgirequest.respond() allows sending the
Content-Disposition header, but the only user of that feature was
removed as part of this change (with the setting of the header
now being performed inline).

A few @webcommand are not as straightforward as the others and
they have not been ported yet.

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 11 2018, 12:23 AM
durin42 accepted this revision.Mar 12 2018, 5:09 PM
This revision is now accepted and ready to land.Mar 12 2018, 5:09 PM
Closed by commit rHG9fc3d814646e: hgweb: port most @webcommand to use modern response type (authored by indygreg). · Explain WhyMar 12 2018, 5:33 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 6923

hgext/highlight/__init__.py

Pygments will try very hard to identify the file type from content and any Pygments will try very hard to identify the file type from content and any
match (even matches with a low confidence score) will be used. match (even matches with a low confidence score) will be used.
""" """
from __future__ import absolute_import from __future__ import absolute_import
from . import highlight from . import highlight
from mercurial.hgweb import ( from mercurial.hgweb import (
common,
webcommands, webcommands,
webutil, webutil,
) )
from mercurial import ( from mercurial import (
encoding, encoding,
extensions, extensions,
fileset, fileset,
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
pygmentize(web, 'annotateline', fctx, tmpl) pygmentize(web, 'annotateline', fctx, tmpl)
return orig(web, req, tmpl) return orig(web, req, tmpl)
def generate_css(web, req, tmpl): def generate_css(web, req, tmpl):
pg_style = web.config('web', 'pygments_style', 'colorful') pg_style = web.config('web', 'pygments_style', 'colorful')
fmter = highlight.HtmlFormatter(style=pg_style) fmter = highlight.HtmlFormatter(style=pg_style)
req.respond(common.HTTP_OK, 'text/css') web.res.headers['Content-Type'] = 'text/css'
return ['/* pygments_style = %s */\n\n' % pg_style, web.res.setbodybytes(''.join([
fmter.get_style_defs('')] '/* pygments_style = %s */\n\n' % pg_style,
fmter.get_style_defs(''),
]))
return web.res
def extsetup(): def extsetup():
# monkeypatch in the new version # monkeypatch in the new version
extensions.wrapfunction(webcommands, '_filerevision', extensions.wrapfunction(webcommands, '_filerevision',
filerevision_highlight) filerevision_highlight)
extensions.wrapfunction(webcommands, 'annotate', annotate_highlight) extensions.wrapfunction(webcommands, 'annotate', annotate_highlight)
webcommands.highlightcss = generate_css webcommands.highlightcss = generate_css
webcommands.__all__.append('highlightcss') webcommands.__all__.append('highlightcss')

mercurial/hgweb/hgweb_mod.py

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': elif cmd == 'file' and req.qsparams.get('style') == 'raw':
rctx.ctype = ctype res.status = '200 Script output follows'
res.headers['Content-Type'] = ctype
content = webcommands.rawfile(rctx, wsgireq, tmpl) 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:

mercurial/hgweb/webcommands.py

return changelog(web, req, tmpl) return changelog(web, req, tmpl)
@webcommand('rawfile') @webcommand('rawfile')
def rawfile(web, req, tmpl): def rawfile(web, req, tmpl):
guessmime = web.configbool('web', 'guessmime') guessmime = web.configbool('web', 'guessmime')
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:
content = manifest(web, req, tmpl) return manifest(web, req, tmpl)
req.respond(HTTP_OK, web.ctype)
return content
try: try:
fctx = webutil.filectx(web.repo, req) fctx = webutil.filectx(web.repo, req)
except error.LookupError as inst: except error.LookupError as inst:
try: try:
content = manifest(web, req, tmpl) return manifest(web, req, tmpl)
req.respond(HTTP_OK, web.ctype)
return content
except ErrorResponse: except ErrorResponse:
raise inst raise inst
path = fctx.path() path = fctx.path()
text = fctx.data() text = fctx.data()
mt = 'application/binary' mt = 'application/binary'
if guessmime: if guessmime:
mt = mimetypes.guess_type(path)[0] mt = mimetypes.guess_type(path)[0]
if mt is None: if mt is None:
if util.binary(text): if util.binary(text):
mt = 'application/binary' mt = 'application/binary'
else: else:
mt = 'text/plain' mt = 'text/plain'
if mt.startswith('text/'): if mt.startswith('text/'):
mt += '; charset="%s"' % encoding.encoding mt += '; charset="%s"' % encoding.encoding
req.respond(HTTP_OK, mt, path, body=text) web.res.headers['Content-Type'] = mt
return [] filename = (path.rpartition('/')[-1]
.replace('\\', '\\\\').replace('"', '\\"'))
web.res.headers['Content-Disposition'] = 'inline; filename="%s"' % filename
web.res.setbodybytes(text)
return web.res
def _filerevision(web, req, tmpl, fctx): def _filerevision(web, req, tmpl, fctx):
f = fctx.path() f = fctx.path()
text = fctx.data() text = fctx.data()
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
ishead = fctx.filerev() in fctx.filelog().headrevs() ishead = fctx.filerev() in fctx.filelog().headrevs()
if util.binary(text): if util.binary(text):
mt = mimetypes.guess_type(f)[0] or 'application/octet-stream' mt = mimetypes.guess_type(f)[0] or 'application/octet-stream'
text = '(binary:%s)' % mt text = '(binary:%s)' % mt
def lines(): def lines():
for lineno, t in enumerate(text.splitlines(True)): for lineno, t in enumerate(text.splitlines(True)):
yield {"line": t, yield {"line": t,
"lineid": "l%d" % (lineno + 1), "lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1), "linenumber": "% 6d" % (lineno + 1),
"parity": next(parity)} "parity": next(parity)}
return tmpl("filerevision", web.res.setbodygen(tmpl(
'filerevision',
file=f, file=f,
path=webutil.up(f), path=webutil.up(f),
text=lines(), text=lines(),
symrev=webutil.symrevorshortnode(req, fctx), symrev=webutil.symrevorshortnode(req, fctx),
rename=webutil.renamelink(fctx), rename=webutil.renamelink(fctx),
permissions=fctx.manifest().flags(f), permissions=fctx.manifest().flags(f),
ishead=int(ishead), ishead=int(ishead),
**pycompat.strkwargs(webutil.commonentry(web.repo, fctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))))
return web.res
@webcommand('file') @webcommand('file')
def file(web, req, tmpl): def file(web, req, tmpl):
""" """
/file/{revision}[/{path}] /file/{revision}[/{path}]
------------------------- -------------------------
Show information about a directory or file in the repository. Show information about a directory or file in the repository.
showforcekw = '' showforcekw = ''
showunforcekw = '' showunforcekw = ''
searchfunc = searchfuncs[mode] searchfunc = searchfuncs[mode]
tip = web.repo['tip'] tip = web.repo['tip']
parity = paritygen(web.stripecount) parity = paritygen(web.stripecount)
return tmpl('search', query=query, node=tip.hex(), symrev='tip', web.res.setbodygen(tmpl(
entries=changelist, archives=web.archivelist("tip"), 'search',
morevars=morevars, lessvars=lessvars, query=query,
node=tip.hex(),
symrev='tip',
entries=changelist,
archives=web.archivelist('tip'),
morevars=morevars,
lessvars=lessvars,
modedesc=searchfunc[1], modedesc=searchfunc[1],
showforcekw=showforcekw, showunforcekw=showunforcekw) showforcekw=showforcekw,
showunforcekw=showunforcekw))
return web.res
@webcommand('changelog') @webcommand('changelog')
def changelog(web, req, tmpl, shortlog=False): def changelog(web, req, tmpl, shortlog=False):
""" """
/changelog[/{revision}] /changelog[/{revision}]
----------------------- -----------------------
Show information about multiple changesets. Show information about multiple changesets.
entries = list(changelist()) entries = list(changelist())
latestentry = entries[:1] latestentry = entries[:1]
if len(entries) > revcount: if len(entries) > revcount:
nextentry = entries[-1:] nextentry = entries[-1:]
entries = entries[:-1] entries = entries[:-1]
else: else:
nextentry = [] nextentry = []
return tmpl('shortlog' if shortlog else 'changelog', changenav=changenav, web.res.setbodygen(tmpl(
node=ctx.hex(), rev=pos, symrev=symrev, changesets=count, 'shortlog' if shortlog else 'changelog',
changenav=changenav,
node=ctx.hex(),
rev=pos,
symrev=symrev,
changesets=count,
entries=entries, entries=entries,
latestentry=latestentry, nextentry=nextentry, latestentry=latestentry,
archives=web.archivelist("tip"), revcount=revcount, nextentry=nextentry,
morevars=morevars, lessvars=lessvars, query=query) archives=web.archivelist('tip'),
revcount=revcount,
morevars=morevars,
lessvars=lessvars,
query=query))
return web.res
@webcommand('shortlog') @webcommand('shortlog')
def shortlog(web, req, tmpl): def shortlog(web, req, tmpl):
""" """
/shortlog /shortlog
--------- ---------
Show basic information about a set of changesets. Show basic information about a set of changesets.
revisions`` for possible values. If not defined, the ``tip`` changeset revisions`` for possible values. If not defined, the ``tip`` changeset
will be shown. will be shown.
The ``changeset`` template is rendered. Contents of the ``changesettag``, The ``changeset`` template is rendered. Contents of the ``changesettag``,
``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many ``changesetbookmark``, ``filenodelink``, ``filenolink``, and the many
templates related to diffs may all be used to produce the output. templates related to diffs may all be used to produce the output.
""" """
ctx = webutil.changectx(web.repo, req) ctx = webutil.changectx(web.repo, req)
web.res.setbodygen(tmpl('changeset',
return tmpl('changeset', **webutil.changesetentry(web, req, tmpl, ctx)) **webutil.changesetentry(web, req, tmpl, ctx)))
return web.res
rev = webcommand('rev')(changeset) rev = webcommand('rev')(changeset)
def decodepath(path): def decodepath(path):
"""Hook for mapping a path in the repository to a path in the """Hook for mapping a path in the repository to a path in the
working copy. working copy.
Extensions (e.g., largefiles) can override this to remap files in Extensions (e.g., largefiles) can override this to remap files in
h = v h = v
path = "%s%s" % (abspath, d) path = "%s%s" % (abspath, d)
yield {"parity": next(parity), yield {"parity": next(parity),
"path": path, "path": path,
"emptydirs": "/".join(emptydirs), "emptydirs": "/".join(emptydirs),
"basename": d} "basename": d}
return tmpl("manifest", web.res.setbodygen(tmpl(
'manifest',
symrev=symrev, symrev=symrev,
path=abspath, path=abspath,
up=webutil.up(abspath), up=webutil.up(abspath),
upparity=next(parity), upparity=next(parity),
fentries=filelist, fentries=filelist,
dentries=dirlist, dentries=dirlist,
archives=web.archivelist(hex(node)), archives=web.archivelist(hex(node)),
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))))
return web.res
@webcommand('tags') @webcommand('tags')
def tags(web, req, tmpl): def tags(web, req, tmpl):
""" """
/tags /tags
----- -----
Show information about tags. Show information about tags.
if latestonly: if latestonly:
t = t[:1] t = t[:1]
for k, n in t: for k, n in t:
yield {"parity": next(parity), yield {"parity": next(parity),
"tag": k, "tag": k,
"date": web.repo[n].date(), "date": web.repo[n].date(),
"node": hex(n)} "node": hex(n)}
return tmpl("tags", web.res.setbodygen(tmpl(
'tags',
node=hex(web.repo.changelog.tip()), node=hex(web.repo.changelog.tip()),
entries=lambda **x: entries(False, False, **x), entries=lambda **x: entries(False, False, **x),
entriesnotip=lambda **x: entries(True, False, **x), entriesnotip=lambda **x: entries(True, False, **x),
latestentry=lambda **x: entries(True, True, **x)) latestentry=lambda **x: entries(True, True, **x)))
return web.res
@webcommand('bookmarks') @webcommand('bookmarks')
def bookmarks(web, req, tmpl): def bookmarks(web, req, tmpl):
""" """
/bookmarks /bookmarks
---------- ----------
Show information about bookmarks. Show information about bookmarks.
"date": web.repo[n].date(), "date": web.repo[n].date(),
"node": hex(n)} "node": hex(n)}
if i: if i:
latestrev = i[0][1] latestrev = i[0][1]
else: else:
latestrev = -1 latestrev = -1
return tmpl("bookmarks", web.res.setbodygen(tmpl(
'bookmarks',
node=hex(web.repo.changelog.tip()), node=hex(web.repo.changelog.tip()),
lastchange=[{"date": web.repo[latestrev].date()}], lastchange=[{'date': web.repo[latestrev].date()}],
entries=lambda **x: entries(latestonly=False, **x), entries=lambda **x: entries(latestonly=False, **x),
latestentry=lambda **x: entries(latestonly=True, **x)) latestentry=lambda **x: entries(latestonly=True, **x)))
return web.res
@webcommand('branches') @webcommand('branches')
def branches(web, req, tmpl): def branches(web, req, tmpl):
""" """
/branches /branches
--------- ---------
Show information about branches. Show information about branches.
All known branches are contained in the output, even closed branches. All known branches are contained in the output, even closed branches.
No arguments are accepted. No arguments are accepted.
The ``branches`` template is rendered. The ``branches`` template is rendered.
""" """
entries = webutil.branchentries(web.repo, web.stripecount) entries = webutil.branchentries(web.repo, web.stripecount)
latestentry = webutil.branchentries(web.repo, web.stripecount, 1) latestentry = webutil.branchentries(web.repo, web.stripecount, 1)
return tmpl('branches', node=hex(web.repo.changelog.tip()),
entries=entries, latestentry=latestentry) web.res.setbodygen(tmpl(
'branches',
node=hex(web.repo.changelog.tip()),
entries=entries,
latestentry=latestentry))
return web.res
@webcommand('summary') @webcommand('summary')
def summary(web, req, tmpl): def summary(web, req, tmpl):
""" """
/summary /summary
-------- --------
Show a summary of repository state. Show a summary of repository state.
tip = web.repo['tip'] tip = web.repo['tip']
count = len(web.repo) count = len(web.repo)
start = max(0, count - web.maxchanges) start = max(0, count - web.maxchanges)
end = min(count, start + web.maxchanges) end = min(count, start + web.maxchanges)
desc = web.config("web", "description") desc = web.config("web", "description")
if not desc: if not desc:
desc = 'unknown' desc = 'unknown'
return tmpl("summary",
web.res.setbodygen(tmpl(
'summary',
desc=desc, desc=desc,
owner=get_contact(web.config) or "unknown", owner=get_contact(web.config) or 'unknown',
lastchange=tip.date(), lastchange=tip.date(),
tags=tagentries, tags=tagentries,
bookmarks=bookmarks, bookmarks=bookmarks,
branches=webutil.branchentries(web.repo, web.stripecount, 10), branches=webutil.branchentries(web.repo, web.stripecount, 10),
shortlog=changelist, shortlog=changelist,
node=tip.hex(), node=tip.hex(),
symrev='tip', symrev='tip',
archives=web.archivelist("tip"), archives=web.archivelist('tip'),
labels=web.configlist('web', 'labels')) labels=web.configlist('web', 'labels')))
return web.res
@webcommand('filediff') @webcommand('filediff')
def filediff(web, req, tmpl): def filediff(web, req, tmpl):
""" """
/diff/{revision}/{path} /diff/{revision}/{path}
----------------------- -----------------------
Show how a file changed in a particular commit. Show how a file changed in a particular commit.
diffs = webutil.diffs(web, tmpl, ctx, basectx, [path], style) diffs = webutil.diffs(web, tmpl, ctx, basectx, [path], style)
if fctx is not None: if fctx is not None:
rename = webutil.renamelink(fctx) rename = webutil.renamelink(fctx)
ctx = fctx ctx = fctx
else: else:
rename = [] rename = []
ctx = ctx ctx = ctx
return tmpl("filediff",
web.res.setbodygen(tmpl(
'filediff',
file=path, file=path,
symrev=webutil.symrevorshortnode(req, ctx), symrev=webutil.symrevorshortnode(req, ctx),
rename=rename, rename=rename,
diff=diffs, diff=diffs,
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))))
return web.res
diff = webcommand('diff')(filediff) diff = webcommand('diff')(filediff)
@webcommand('comparison') @webcommand('comparison')
def comparison(web, req, tmpl): def comparison(web, req, tmpl):
""" """
/comparison/{revision}/{path} /comparison/{revision}/{path}
----------------------------- -----------------------------
comparison = webutil.compare(tmpl, context, leftlines, rightlines) comparison = webutil.compare(tmpl, context, leftlines, rightlines)
if fctx is not None: if fctx is not None:
rename = webutil.renamelink(fctx) rename = webutil.renamelink(fctx)
ctx = fctx ctx = fctx
else: else:
rename = [] rename = []
ctx = ctx ctx = ctx
return tmpl('filecomparison',
web.res.setbodygen(tmpl(
'filecomparison',
file=path, file=path,
symrev=webutil.symrevorshortnode(req, ctx), symrev=webutil.symrevorshortnode(req, ctx),
rename=rename, rename=rename,
leftrev=leftrev, leftrev=leftrev,
leftnode=hex(leftnode), leftnode=hex(leftnode),
rightrev=rightrev, rightrev=rightrev,
rightnode=hex(rightnode), rightnode=hex(rightnode),
comparison=comparison, comparison=comparison,
**pycompat.strkwargs(webutil.commonentry(web.repo, ctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, ctx))))
return web.res
@webcommand('annotate') @webcommand('annotate')
def annotate(web, req, tmpl): def annotate(web, req, tmpl):
""" """
/annotate/{revision}/{path} /annotate/{revision}/{path}
--------------------------- ---------------------------
Show changeset information for each line in a file. Show changeset information for each line in a file.
"lineno": lineno + 1, "lineno": lineno + 1,
"lineid": "l%d" % (lineno + 1), "lineid": "l%d" % (lineno + 1),
"linenumber": "% 6d" % (lineno + 1), "linenumber": "% 6d" % (lineno + 1),
"revdate": f.date()} "revdate": f.date()}
diffopts = webutil.difffeatureopts(req, web.repo.ui, 'annotate') diffopts = webutil.difffeatureopts(req, web.repo.ui, 'annotate')
diffopts = {k: getattr(diffopts, k) for k in diffopts.defaults} diffopts = {k: getattr(diffopts, k) for k in diffopts.defaults}
return tmpl("fileannotate", web.res.setbodygen(tmpl(
'fileannotate',
file=f, file=f,
annotate=annotate, annotate=annotate,
path=webutil.up(f), path=webutil.up(f),
symrev=webutil.symrevorshortnode(req, fctx), symrev=webutil.symrevorshortnode(req, fctx),
rename=webutil.renamelink(fctx), rename=webutil.renamelink(fctx),
permissions=fctx.manifest().flags(f), permissions=fctx.manifest().flags(f),
ishead=int(ishead), ishead=int(ishead),
diffopts=diffopts, diffopts=diffopts,
**pycompat.strkwargs(webutil.commonentry(web.repo, fctx))) **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))))
return web.res
@webcommand('filelog') @webcommand('filelog')
def filelog(web, req, tmpl): def filelog(web, req, tmpl):
""" """
/filelog/{revision}/{path} /filelog/{revision}/{path}
-------------------------- --------------------------
Show information about the history of a file in the repository. Show information about the history of a file in the repository.
'edges': edgedata, 'edges': edgedata,
'row': row, 'row': row,
'nextrow': row + 1}) 'nextrow': row + 1})
yield entry yield entry
rows = len(tree) rows = len(tree)
return tmpl('graph', rev=rev, symrev=symrev, revcount=revcount, web.res.setbodygen(tmpl(
'graph',
rev=rev,
symrev=symrev,
revcount=revcount,
uprev=uprev, uprev=uprev,
lessvars=lessvars, morevars=morevars, downrev=downrev, lessvars=lessvars,
morevars=morevars,
downrev=downrev,
graphvars=graphvars, graphvars=graphvars,
rows=rows, rows=rows,
bg_height=bg_height, bg_height=bg_height,
changesets=count, changesets=count,
nextentry=nextentry, nextentry=nextentry,
jsdata=lambda **x: jsdata(), jsdata=lambda **x: jsdata(),
nodes=lambda **x: nodes(), nodes=lambda **x: nodes(),
node=ctx.hex(), changenav=changenav) node=ctx.hex(),
changenav=changenav))
return web.res
def _getdoc(e): def _getdoc(e):
doc = e[0].__doc__ doc = e[0].__doc__
if doc: if doc:
doc = _(doc).partition('\n')[0] doc = _(doc).partition('\n')[0]
else: else:
doc = _('(no help text available)') doc = _('(no help text available)')
return doc return doc
def earlycommands(**map): def earlycommands(**map):
for c, doc in early: for c, doc in early:
yield {'topic': c, 'summary': doc} yield {'topic': c, 'summary': doc}
def othercommands(**map): def othercommands(**map):
for c, doc in other: for c, doc in other:
yield {'topic': c, 'summary': doc} yield {'topic': c, 'summary': doc}
return tmpl('helptopics', topics=topics, earlycommands=earlycommands, web.res.setbodygen(tmpl(
othercommands=othercommands, title='Index') 'helptopics',
topics=topics,
earlycommands=earlycommands,
othercommands=othercommands,
title='Index'))
return web.res
# Render an index of sub-topics. # Render an index of sub-topics.
if topicname in helpmod.subtopics: if topicname in helpmod.subtopics:
topics = [] topics = []
for entries, summary, _doc in helpmod.subtopics[topicname]: for entries, summary, _doc in helpmod.subtopics[topicname]:
topics.append({ topics.append({
'topic': '%s.%s' % (topicname, entries[0]), 'topic': '%s.%s' % (topicname, entries[0]),
'basename': entries[0], 'basename': entries[0],
'summary': summary, 'summary': summary,
}) })
return tmpl('helptopics', topics=topics, title=topicname, web.res.setbodygen(tmpl(
subindex=True) 'helptopics',
topics=topics,
title=topicname,
subindex=True))
return web.res
u = webutil.wsgiui.load() u = webutil.wsgiui.load()
u.verbose = True u.verbose = True
# Render a page from a sub-topic. # Render a page from a sub-topic.
if '.' in topicname: if '.' in topicname:
# TODO implement support for rendering sections, like # TODO implement support for rendering sections, like
# `hg help` works. # `hg help` works.
topic, subtopic = topicname.split('.', 1) topic, subtopic = topicname.split('.', 1)
if topic not in helpmod.subtopics: if topic not in helpmod.subtopics:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
else: else:
topic = topicname topic = topicname
subtopic = None subtopic = None
try: try:
doc = helpmod.help_(u, commands, topic, subtopic=subtopic) doc = helpmod.help_(u, commands, topic, subtopic=subtopic)
except error.Abort: except error.Abort:
raise ErrorResponse(HTTP_NOT_FOUND) raise ErrorResponse(HTTP_NOT_FOUND)
return tmpl('help', topic=topicname, doc=doc)
web.res.setbodygen(tmpl(
'help',
topic=topicname,
doc=doc))
return web.res
# tell hggettext to extract docstrings from these functions: # tell hggettext to extract docstrings from these functions:
i18nfunctions = commands.values() i18nfunctions = commands.values()