Mercurial > hg
comparison mercurial/cmdutil.py @ 34001:3340efe80803
morestatus: simplify check for unresolved merge conflicts
Differential Revision: https://phab.mercurial-scm.org/D546
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 28 Aug 2017 14:47:18 -0700 |
| parents | e5d104c35e51 |
| children | da07367d683b |
comparison
equal
deleted
inserted
replaced
| 34000:5cef00cdba7f | 34001:3340efe80803 |
|---|---|
| 585 mergestate = mergemod.mergestate.read(repo) | 585 mergestate = mergemod.mergestate.read(repo) |
| 586 if not mergestate.active(): | 586 if not mergestate.active(): |
| 587 return | 587 return |
| 588 | 588 |
| 589 m = scmutil.match(repo[None]) | 589 m = scmutil.match(repo[None]) |
| 590 unresolvedlist = [f for f in mergestate if m(f) and mergestate[f] == 'u'] | 590 unresolvedlist = [f for f in mergestate.unresolved() if m(f)] |
| 591 if unresolvedlist: | 591 if unresolvedlist: |
| 592 mergeliststr = '\n'.join( | 592 mergeliststr = '\n'.join( |
| 593 [' %s' % os.path.relpath( | 593 [' %s' % os.path.relpath( |
| 594 os.path.join(repo.root, path), | 594 os.path.join(repo.root, path), |
| 595 pycompat.getcwd()) for path in unresolvedlist]) | 595 pycompat.getcwd()) for path in unresolvedlist]) |