Mercurial > hg

diff mercurial/commands.py @ 39928:f07ab9ddc0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 f6874567a93b
children 47cb6750dea3
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