Mercurial > hg-stable

changeset 26740:f4a27c05c43f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Siddharth Agarwal <sid0@fb.com>
date Wed, 14 Oct 2015 15:01:07 -0700
parents 8429369eeb85
children e1568d5eb052
files mercurial/merge.py
diffstat 1 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Wed Oct 14 16:27:10 2015 -0700
+++ b/mercurial/merge.py	Wed Oct 14 15:01:07 2015 -0700
@@ -329,6 +329,13 @@
             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':