Mercurial > hg-stable

changeset 26764:7ce6fd705495

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commands.resolve: support printing out driver-resolved files There's no user-visible way to mark files as driver-resolved, so this status won't be visible.
author Siddharth Agarwal <sid0@fb.com>
date Thu, 15 Oct 2015 00:45:20 -0700
parents 50fc80e46786
children 45976219eb80
files mercurial/commands.py
diffstat 1 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/commands.py	Sat Oct 17 12:32:23 2015 -0700
+++ b/mercurial/commands.py	Thu Oct 15 00:45:20 2015 -0700
@@ -5588,7 +5588,8 @@
         for f in ms:
             if not m(f):
                 continue
-            l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved'}[ms[f]]
+            l = 'resolve.' + {'u': 'unresolved', 'r': 'resolved',
+                              'd': 'driverresolved'}[ms[f]]
             fm.startitem()
             fm.condwrite(not nostatus, 'status', '%s ', ms[f].upper(), label=l)
             fm.write('path', '%s\n', f, label=l)