Read about our upcoming Code of Conduct on this issue

Commit 0f8072a6 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

mergestate: add a function to return the number of unresolved files

Note that unlike the other functions, this is based on the persistent
parent 09139ccf3085
......@@ -504,6 +504,11 @@ class mergestate(object):
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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment