Patchwork D7591: status: remove pointless filtering by alwaysmatcher in morestatus

login
register
mail settings
Submitter phabricator
Date Dec. 10, 2019, 3:45 p.m.
Message ID <a2e524e518491b31bfc2d9a88a086157@localhost.localdomain>
Download mbox | patch
Permalink /patch/43671/
State Not Applicable
Headers show

Comments

phabricator - Dec. 10, 2019, 3:45 p.m.
Closed by commit rHG072b745936f1: status: remove pointless filtering by alwaysmatcher in morestatus (authored by martinvonz).
This revision was automatically updated to reflect the committed changes.

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D7591?vs=18558&id=18571

CHANGES SINCE LAST ACTION
  https://phab.mercurial-scm.org/D7591/new/

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

AFFECTED FILES
  mercurial/cmdutil.py

CHANGE DETAILS




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

Patch

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 = (