Mercurial > hg > mercurial-source

diff mercurial/merge.py @ 27717:ca3fbf9dad8c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: add a function to return the number of unresolved files Note that unlike the other functions, this is based on the persistent mergestate.
author Siddharth Agarwal <sid0@fb.com>
date Fri, 20 Nov 2015 16:18:51 -0800 (2015-11-21)
parents 09139ccf3085
children a421debae31d
line wrap: on
line diff
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -504,6 +504,11 @@
                     merged += 1
         return updated, merged, removed
 
+    def unresolvedcount(self):
+        """get unresolved count for this merge (persistent)"""
+        return len([True for f, entry in self._state.iteritems()
+                    if entry[0] == 'u'])
+
 def _checkunknownfile(repo, wctx, mctx, f, f2=None):
     if f2 is None:
         f2 = f