# HG changeset patch
# User Martin von Zweigbergk <martinvonz@google.com>
# Date 2019-12-09 17:50:39
# Node ID 072b745936f1b1615019437c28d0232c97bc0d71
# Parent  e8a3bbffdc7dc14a1b1ec55c8f1274c9d2d7b822

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

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -783,13 +783,12 @@ def _conflictsmsg(repo):
     if not mergestate.active():
         return
 
-    m = scmutil.match(repo[None])
-    unresolvedlist = [f for f in mergestate.unresolved() if m(f)]
+    unresolvedlist = sorted(mergestate.unresolved())
     if unresolvedlist:
         mergeliststr = b'\n'.join(
             [
                 b'    %s' % util.pathto(repo.root, encoding.getcwd(), path)
-                for path in sorted(unresolvedlist)
+                for path in unresolvedlist
             ]
         )
         msg = (