# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1420589908 21600
# Node ID b9d06fa10ef29c012d48bd4f3c93fd7bf1347d40
# Parent  86810cd85eb85c15da72f55ae1e1dcc4ffc93d74# Parent  f4e6475950f18a08663c2f4ea8f6352a1b0b55fa
merge with stable

diff -r 86810cd85eb8 -r b9d06fa10ef2 mercurial/cmdutil.py
--- 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]' %
diff -r 86810cd85eb8 -r b9d06fa10ef2 tests/test-command-template.t
--- a/tests/test-command-template.t	Wed Dec 31 18:18:56 2014 -0500
+++ b/tests/test-command-template.t	Tue Jan 06 18:18:28 2015 -0600
@@ -715,8 +715,8 @@
     "manifest": "94961b75a2da554b4df6fb599e5bfc7d48de0c64",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": ["second"],
-    "removed": ["fourth", "third"]
+    "added": ["fourth", "third"],
+    "removed": ["second"]
    },
    {
     "rev": 7,
@@ -732,8 +732,8 @@
     "manifest": "f2dbc354b94e5ec0b4f10680ee0cee816101d0bf",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": ["second"]
+    "added": ["second"],
+    "removed": []
    },
    {
     "rev": 6,
@@ -766,8 +766,8 @@
     "manifest": "4dc3def4f9b4c6e8de820f6ee74737f91e96a216",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": ["d"]
+    "added": ["d"],
+    "removed": []
    },
    {
     "rev": 4,
@@ -817,8 +817,8 @@
     "manifest": "6e0e82995c35d0d57a52aca8da4e56139e06b4b1",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": ["c"]
+    "added": ["c"],
+    "removed": []
    },
    {
     "rev": 1,
@@ -834,8 +834,8 @@
     "manifest": "4e8d705b1e53e3f9375e0e60dc7b525d8211fe55",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": ["b"]
+    "added": ["b"],
+    "removed": []
    },
    {
     "rev": 0,
@@ -851,8 +851,8 @@
     "manifest": "a0c8bcbbb45c63b90b70ad007bf38961f64f2af0",
     "extra": {"branch": "default"},
     "modified": [],
-    "added": [],
-    "removed": ["a"]
+    "added": ["a"],
+    "removed": []
    }
   ]