# HG changeset patch
# User Siddharth Agarwal <sid0@fb.com>
# Date 2015-10-14 22:01:07
# Node ID f4a27c05c43f78c4a94d7749ee6039df6bce33d3
# Parent  8429369eeb850d1eb9243da3367bf1bd9d31f560

merge.mergestate: add a generator for driver-resolved files

Just like for unresolved files above, we need to be able to tell what files are
driver-resolved.

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -329,6 +329,13 @@ class mergestate(object):
             if entry[0] == 'u':
                 yield f
 
+    def driverresolved(self):
+        """Obtain the paths of driver-resolved files."""
+
+        for f, entry in self._state.items():
+            if entry[0] == 'd':
+                yield f
+
     def _resolve(self, preresolve, dfile, wctx, labels=None):
         """rerun merge process for file path `dfile`"""
         if self[dfile] in 'rd':