Mercurial > public > mercurial-scm > hg
comparison mercurial/cmdutil.py @ 43820:072b745936f1
status: remove pointless filtering by alwaysmatcher in morestatus
The code has been like this since it was imported from FB's
hg-experimental repo. It has been like that even since it was added in
that repo. So I don't know why it looks that way. Perhaps the idea was
to one day filter the unresolved paths by any patterns provided by the
user. We can add a matcher back if we ever decide to do that.
Differential Revision: https://phab.mercurial-scm.org/D7591
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Mon, 09 Dec 2019 09:50:39 -0800 |
| parents | 5558e3437872 |
| children | fb4a6d584756 |
comparison
equal
deleted
inserted
replaced
| 43819:e8a3bbffdc7d | 43820:072b745936f1 |
|---|---|
| 781 def _conflictsmsg(repo): | 781 def _conflictsmsg(repo): |
| 782 mergestate = mergemod.mergestate.read(repo) | 782 mergestate = mergemod.mergestate.read(repo) |
| 783 if not mergestate.active(): | 783 if not mergestate.active(): |
| 784 return | 784 return |
| 785 | 785 |
| 786 m = scmutil.match(repo[None]) | 786 unresolvedlist = sorted(mergestate.unresolved()) |
| 787 unresolvedlist = [f for f in mergestate.unresolved() if m(f)] | |
| 788 if unresolvedlist: | 787 if unresolvedlist: |
| 789 mergeliststr = b'\n'.join( | 788 mergeliststr = b'\n'.join( |
| 790 [ | 789 [ |
| 791 b' %s' % util.pathto(repo.root, encoding.getcwd(), path) | 790 b' %s' % util.pathto(repo.root, encoding.getcwd(), path) |
| 792 for path in sorted(unresolvedlist) | 791 for path in unresolvedlist |
| 793 ] | 792 ] |
| 794 ) | 793 ) |
| 795 msg = ( | 794 msg = ( |
| 796 _( | 795 _( |
| 797 '''Unresolved merge conflicts: | 796 '''Unresolved merge conflicts: |