diff -r c66d95aa1270 -r eb52de500d2a mercurial/templatekw.py
--- a/mercurial/templatekw.py	Fri May 29 15:18:49 2015 -0700
+++ b/mercurial/templatekw.py	Mon Jun 01 14:47:02 2015 -0500
@@ -111,7 +111,7 @@
 
 def getfiles(repo, ctx, revcache):
     if 'files' not in revcache:
-        revcache['files'] = repo.status(ctx.p1().node(), ctx.node())[:3]
+        revcache['files'] = repo.status(ctx.p1(), ctx)[:3]
     return revcache['files']
 
 def getlatesttags(repo, ctx, cache):