Patchwork D8084: merge: use manifestdict.walk() instead of manifestdict.matches()

login
register
mail settings
Submitter phabricator
Date Feb. 7, 2020, 10:11 p.m.
Message ID <2e8a56594392688a2da1291089cd1c62@localhost.localdomain>
Download mbox | patch
Permalink /patch/45041/
State Not Applicable
Headers show

Comments

phabricator - Feb. 7, 2020, 10:11 p.m.
Closed by commit rHG0e5f6c70aeb4: merge: use manifestdict.walk() instead of manifestdict.matches() (authored by durin42).
This revision was automatically updated to reflect the committed changes.

CHANGED PRIOR TO COMMIT
  https://phab.mercurial-scm.org/D8084?vs=20004&id=20006#toc

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D8084?vs=20004&id=20006

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

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

AFFECTED FILES
  mercurial/merge.py

CHANGE DETAILS




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

Patch

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -997,11 +997,10 @@ 
     """
     Check for case-folding collisions.
     """
-
     # If the repo is narrowed, filter out files outside the narrowspec.
     narrowmatch = repo.narrowmatch()
     if not narrowmatch.always():
-        wmf = wmf.matches(narrowmatch)
+        pmmf = set(wmf.walk(narrowmatch))
         if actions:
             narrowactions = {}
             for m, actionsfortype in pycompat.iteritems(actions):
@@ -1010,9 +1009,9 @@ 
                     if narrowmatch(f):
                         narrowactions[m].append((f, args, msg))
             actions = narrowactions
-
-    # build provisional merged manifest up
-    pmmf = set(wmf)
+    else:
+        # build provisional merged manifest up
+        pmmf = set(wmf)
 
     if actions:
         # KEEP and EXEC are no-op