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

login
register
mail settings
Submitter phabricator
Date Dec. 9, 2019, 5:51 p.m.
Message ID <differential-rev-PHID-DREV-npadwjhlvlogbp6kspit-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/43658/
State Superseded
Headers show

Comments

phabricator - Dec. 9, 2019, 5:51 p.m.
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




To: martinvonz, #hg-reviewers
Cc: mercurial-devel
phabricator - Dec. 10, 2019, 5:33 a.m.
rdamazio added a comment.


  FYI I'm going to send a chain that rewrites a lot of this

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
Cc: rdamazio, mercurial-devel
phabricator - Dec. 10, 2019, 5:40 a.m.
martinvonz added a comment.


  In D7591#111569 <https://phab.mercurial-scm.org/D7591#111569>, @rdamazio wrote:
  
  > FYI I'm going to send a chain that rewrites a lot of this
  
  To be clear, are you telling reviewers not to queue this one because you will be rewriting the *patch* or you're saying that you will later be sending patches on top of this one?

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
Cc: rdamazio, mercurial-devel
phabricator - Dec. 10, 2019, 5:56 a.m.
rdamazio added a comment.


  In D7591#111570 <https://phab.mercurial-scm.org/D7591#111570>, @martinvonz wrote:
  
  > In D7591#111569 <https://phab.mercurial-scm.org/D7591#111569>, @rdamazio wrote:
  >
  >> FYI I'm going to send a chain that rewrites a lot of this
  >
  > To be clear, are you telling reviewers not to queue this one because you will be rewriting the *patch* or you're saying that you will later be sending patches on top of this one?
  
  I'm writing a larger change which includes this change, I don't mind merging the conflict if you want to go ahead and queue this.

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
Cc: rdamazio, mercurial-devel
phabricator - Dec. 10, 2019, 5:59 a.m.
martinvonz added a comment.


  In D7591#111571 <https://phab.mercurial-scm.org/D7591#111571>, @rdamazio wrote:
  
  > In D7591#111570 <https://phab.mercurial-scm.org/D7591#111570>, @martinvonz wrote:
  >
  >> In D7591#111569 <https://phab.mercurial-scm.org/D7591#111569>, @rdamazio wrote:
  >>
  >>> FYI I'm going to send a chain that rewrites a lot of this
  >>
  >> To be clear, are you telling reviewers not to queue this one because you will be rewriting the *patch* or you're saying that you will later be sending patches on top of this one?
  >
  > I'm writing a larger change which includes this change, I don't mind merging the conflict if you want to go ahead and queue this.
  
  Okay, I think it makes sense to queue this one if it's just a subset of you changes.

REPOSITORY
  rHG Mercurial

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

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

To: martinvonz, #hg-reviewers
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 = (