Mercurial > hg

diff mercurial/filemerge.py @ 35469:f1c54d003327

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: move repo, ui and cache to per-engine resources
author Yuya Nishihara <yuya@tcha.org>
date Thu, 21 Dec 2017 22:05:30 +0900
parents ef7e667a4f7b
children c240657febb7
line wrap: on
line diff
--- a/mercurial/filemerge.py	Thu Dec 21 21:29:06 2017 +0900
+++ b/mercurial/filemerge.py	Thu Dec 21 22:05:30 2017 +0900
@@ -581,7 +581,8 @@
     ui = repo.ui
     template = ui.config('ui', 'mergemarkertemplate')
     template = templater.unquotestring(template)
-    tmpl = formatter.maketemplater(ui, template)
+    tres = formatter.templateresources(ui, repo)
+    tmpl = formatter.maketemplater(ui, template, resources=tres)
 
     pad = max(len(l) for l in labels)