Mercurial > hg

diff mercurial/dirstatemap.py @ 47514:559aee84b889

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-entry: add a `from_p2` property Lets start to define and use more semantic property. Differential Revision: https://phab.mercurial-scm.org/D10956
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sat, 03 Jul 2021 04:26:28 +0200
parents 10e740292dff
children abed645b8e96
line wrap: on
line diff
--- a/mercurial/dirstatemap.py	Sat Jul 03 04:07:21 2021 +0200
+++ b/mercurial/dirstatemap.py	Sat Jul 03 04:26:28 2021 +0200
@@ -173,7 +173,7 @@
                 # backup the previous state
                 if entry.merged:  # merge
                     size = NONNORMAL
-                elif entry[0] == b'n' and entry[2] == FROM_P2:  # other parent
+                elif entry[0] == b'n' and entry.from_p2:
                     size = FROM_P2
                     self.otherparentset.add(f)
         if size == 0: