[PATCH 1 of 7 mergedriver] commands.resolve: support printing out driver-resolved files

Siddharth Agarwal sid0 at fb.com
Sat Oct 17 02:35:14 UTC 2015


# HG changeset patch
# User Siddharth Agarwal <sid0 at fb.com>
# Date 1444895120 25200
#      Thu Oct 15 00:45:20 2015 -0700
# Node ID b7d49ea007826ec28354bb67b10f651a5cbbf905
# Parent  e1568d5eb0522b3ab20a1cbb15ec06f6d198c9a8
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.

diff --git a/mercurial/commands.py b/mercurial/commands.py
--- a/mercurial/commands.py
+++ b/mercurial/commands.py
@@ -5563,7 +5563,8 @@ def resolve(ui, repo, *pats, **opts):
         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)


More information about the Mercurial-devel mailing list