Mercurial > public > mercurial-scm > hg-stable

diff mercurial/cmdutil.py @ 23735:b9d06fa10ef2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with stable
author Matt Mackall <mpm@selenic.com>
date Tue, 06 Jan 2015 18:18:28 -0600
parents e41bcb019633 f4e6475950f1
children 07309e527df7
line wrap: on
line diff
--- 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]' %