changeset 39933:f07ab9ddc0c0

resolve: rename {status} to {mergestatus} to not shadow change status (BC) This is a part of the name unification. I think it's somewhat useful to provide a combined view of change/merge statuses. https://www.mercurial-scm.org/wiki/GenericTemplatingPlan#Dictionary
author Yuya Nishihara <yuya@tcha.org>
date Sun, 30 Sep 2018 15:15:27 +0900
parents 59592ac26f85
children 47cb6750dea3
files mercurial/commands.py tests/test-resolve.t
diffstat 2 files changed, 8 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Mon Oct 01 09:06:01 2018 -0400
+++ b/mercurial/commands.py	Sun Sep 30 15:15:27 2018 +0900
@@ -4622,7 +4622,7 @@
             label, key = mergestateinfo[ms[f]]
             fm.startitem()
             fm.context(ctx=wctx)
-            fm.condwrite(not nostatus, 'status', '%s ', key, label=label)
+            fm.condwrite(not nostatus, 'mergestatus', '%s ', key, label=label)
             fm.write('path', '%s\n', f, label=label)
         fm.end()
         return 0
--- a/tests/test-resolve.t	Mon Oct 01 09:06:01 2018 -0400
+++ b/tests/test-resolve.t	Sun Sep 30 15:15:27 2018 +0900
@@ -156,18 +156,18 @@
   $ hg resolve -l -Tjson
   [
    {
-    "path": "file1",
-    "status": "R"
+    "mergestatus": "R",
+    "path": "file1"
    },
    {
-    "path": "file2",
-    "status": "U"
+    "mergestatus": "U",
+    "path": "file2"
    }
   ]
 
-  $ hg resolve -l -T '{path} {status} {p1rev} {p2rev}\n'
-  file1 R 2 1
-  file2 U 2 1
+  $ hg resolve -l -T '{path} {mergestatus} {status} {p1rev} {p2rev}\n'
+  file1 R M 2 1
+  file2 U M 2 1
 
 resolve -m without paths should mark all resolved