Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/merge.py @ 27077:ca3fbf9dad8c
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 |
| parents | 09139ccf3085 |
| children | a421debae31d |
comparison
equal
deleted
inserted
replaced
| 27076:09139ccf3085 | 27077:ca3fbf9dad8c |
|---|---|
| 501 if action == 'r': | 501 if action == 'r': |
| 502 removed += 1 | 502 removed += 1 |
| 503 else: | 503 else: |
| 504 merged += 1 | 504 merged += 1 |
| 505 return updated, merged, removed | 505 return updated, merged, removed |
| 506 | |
| 507 def unresolvedcount(self): | |
| 508 """get unresolved count for this merge (persistent)""" | |
| 509 return len([True for f, entry in self._state.iteritems() | |
| 510 if entry[0] == 'u']) | |
| 506 | 511 |
| 507 def _checkunknownfile(repo, wctx, mctx, f, f2=None): | 512 def _checkunknownfile(repo, wctx, mctx, f, f2=None): |
| 508 if f2 is None: | 513 if f2 is None: |
| 509 f2 = f | 514 f2 = f |
| 510 return (os.path.isfile(repo.wjoin(f)) | 515 return (os.path.isfile(repo.wjoin(f)) |