diff -r 7ad6a275316f -r 1f42d621f090 mercurial/hgweb/webcommands.py --- a/mercurial/hgweb/webcommands.py Sat Mar 10 14:19:27 2018 -0800 +++ b/mercurial/hgweb/webcommands.py Sat Mar 10 17:02:57 2018 -0800 @@ -53,6 +53,16 @@ The decorator takes as its positional arguments the name/path the command should be accessible under. + When called, functions receive as arguments a ``requestcontext``, + ``wsgirequest``, and a templater instance for generatoring output. + The functions should populate the ``rctx.res`` object with details + about the HTTP response. + + The function can return the ``requestcontext.res`` instance to signal + that it wants to use this object to generate the response. If an iterable + is returned, the ``wsgirequest`` instance will be used and the returned + content will constitute the response body. + Usage: @webcommand('mycommand') @@ -1068,19 +1078,22 @@ latestentry = entries[:1] - return tmpl("filelog", - file=f, - nav=nav, - symrev=webutil.symrevorshortnode(req, fctx), - entries=entries, - descend=descend, - patch=patch, - latestentry=latestentry, - linerange=linerange, - revcount=revcount, - morevars=morevars, - lessvars=lessvars, - **pycompat.strkwargs(webutil.commonentry(web.repo, fctx))) + web.res.setbodygen(tmpl( + 'filelog', + file=f, + nav=nav, + symrev=webutil.symrevorshortnode(req, fctx), + entries=entries, + descend=descend, + patch=patch, + latestentry=latestentry, + linerange=linerange, + revcount=revcount, + morevars=morevars, + lessvars=lessvars, + **pycompat.strkwargs(webutil.commonentry(web.repo, fctx)))) + + return web.res @webcommand('archive') def archive(web, req, tmpl):