D7591: status: remove pointless filtering by alwaysmatcher in morestatus

martinvonz (Martin von Zweigbergk) phabricator at mercurial-scm.org
Mon Dec 9 12:51:20 EST 2019


martinvonz created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D7591

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS

diff --git a/mercurial/cmdutil.py b/mercurial/cmdutil.py
--- a/mercurial/cmdutil.py
+++ b/mercurial/cmdutil.py
@@ -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 = (



To: martinvonz, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list