--- a/mercurial/cmdutil.py	Wed Dec 31 18:18:56 2014 -0500
+++ b/mercurial/cmdutil.py	Tue Jan 06 18:18:28 2015 -0600
@@ -1072,7 +1072,7 @@
                           ", ".join('"%s": "%s"' % (j(k), j(v))
                                     for k, v in ctx.extra().items()))
 
-            files = ctx.status(ctx.p1())
+            files = ctx.p1().status(ctx)
             self.ui.write(',\n  "modified": [%s]' %
                           ", ".join('"%s"' % j(f) for f in files[0]))
             self.ui.write(',\n  "added": [%s]' %