Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: use the `p2_info` property to replace more verbose call
authorPierre-Yves David <pierre-yves.david@octobus.net>
Fri, 01 Oct 2021 04:04:38 +0200
changeset 48148 e2753a7acfa7
parent 48147 142e9f0a70b5
child 48149 6ac2b417d5d7
dirstate-item: use the `p2_info` property to replace more verbose call Differential Revision: https://phab.mercurial-scm.org/D11592
mercurial/dirstate.py file | annotate | diff | comparison | revisions
mercurial/dirstatemap.py file | annotate | diff | comparison | revisions 
--- a/mercurial/dirstate.py	Wed Sep 29 02:06:04 2021 +0200
+++ b/mercurial/dirstate.py	Fri Oct 01 04:04:38 2021 +0200
@@ -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)
--- a/mercurial/dirstatemap.py	Wed Sep 29 02:06:04 2021 +0200
+++ b/mercurial/dirstatemap.py	Fri Oct 01 04:04:38 2021 +0200
@@ -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:
mercurial