Mercurial > hg

changeset 43820:072b745936f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e8a3bbffdc7d
children ea97cd64c500
files mercurial/cmdutil.py
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/cmdutil.py	Sat Dec 07 13:07:25 2019 -0800
+++ b/mercurial/cmdutil.py	Mon Dec 09 09:50:39 2019 -0800
@@ -783,13 +783,12 @@
     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 = (