Comments
Patch
@@ -27,12 +27,14 @@ from .request import wsgirequest
from .. import (
encoding,
error,
+ formatter,
hg,
hook,
profiling,
pycompat,
repoview,
templatefilters,
+ templatekw,
templater,
ui as uimod,
util,
@@ -199,8 +201,8 @@ class requestcontext(object):
return templatefilters.websub(text, self.websubtable)
# create the templater
-
- defaults = {
+ defaults = templatekw.keywords.copy()
+ defaults.update({
'url': req.url,
'logourl': logourl,
'logoimg': logoimg,
@@ -213,10 +215,12 @@ class requestcontext(object):
'pathdef': makebreadcrumb(req.url),
'style': style,
'nonce': self.nonce,
- }
+ })
+ tres = formatter.templateresources(self.repo.ui, self.repo)
tmpl = templater.templater.frommapfile(mapfile,
filters={'websub': websubfilter},
- defaults=defaults)
+ defaults=defaults,
+ resources=tres)
return tmpl
@@ -354,6 +354,11 @@ def formatlinerange(fromline, toline):
def commonentry(repo, ctx):
node = ctx.node()
return {
+ # TODO: perhaps ctx.changectx() should be assigned if ctx is a
+ # filectx, but I'm not pretty sure if that would always work because
+ # fctx.parents() != fctx.changectx.parents() for example.
+ 'ctx': ctx,
+ 'revcache': {},
'rev': ctx.rev(),
'node': hex(node),
'author': ctx.user(),