--- a/mercurial/cmdutil.py	Sun Apr 03 23:26:48 2016 +0900
+++ b/mercurial/cmdutil.py	Sun Apr 10 17:23:09 2016 +0900
@@ -1492,9 +1492,9 @@
             self.t = templater.templater.frommapfile(mapfile, filters=filters,
                                                      cache=defaulttempl)
         else:
-            self.t = templater.templater(filters=filters, cache=defaulttempl)
-            if tmpl:
-                self.t.cache['changeset'] = tmpl
+            self.t = formatter.maketemplater(ui, 'changeset', tmpl,
+                                             filters=filters,
+                                             cache=defaulttempl)
 
         self.cache = {}