Patchwork D11592: dirstate-item: use the `p2_info` property to replace more verbose call

login
register
mail settings
Submitter phabricator
Date Oct. 3, 2021, 12:40 a.m.
Message ID <differential-rev-PHID-DREV-7hmpuj6giaytxlakhjzo-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49917/
State Superseded
Headers show

Comments

phabricator - Oct. 3, 2021, 12:40 a.m.
marmoute created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REPOSITORY
  rHG Mercurial

BRANCH
  default

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

AFFECTED FILES
  mercurial/dirstate.py
  mercurial/dirstatemap.py

CHANGE DETAILS




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py
--- a/mercurial/dirstatemap.py
+++ b/mercurial/dirstatemap.py
@@ -332,7 +332,7 @@ 
         if fold_p2:
             for f, s in pycompat.iteritems(self._map):
                 # Discard "merged" markers when moving away from a merge state
-                if s.merged or s.from_p2:
+                if s.p2_info:
                     source = self.copymap.pop(f, None)
                     if source:
                         copies[f] = source
@@ -604,7 +604,7 @@ 
                 # enables in-place mutation of elements of a collection while
                 # iterating it, without mutating the collection itself.
                 files_with_p2_info = [
-                    f for f, s in self._map.items() if s.merged or s.from_p2
+                    f for f, s in self._map.items() if s.p2_info
                 ]
                 rust_map = self._map
                 for f in files_with_p2_info:
diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py
--- a/mercurial/dirstate.py
+++ b/mercurial/dirstate.py
@@ -1372,7 +1372,7 @@ 
 
             if not st and t.tracked:
                 dadd(fn)
-            elif t.merged or t.from_p2:
+            elif t.p2_info:
                 madd(fn)
             elif t.added:
                 aadd(fn)