Mercurial > hg

diff mercurial/pure/parsers.py @ 47517:28632eb3ca3e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-entry: restrict `from_p2` property to tracked file The other case is now handled in `from_p2_removed`, and should ideally be moved to a lower level. So we can drop the `state == 'n'` narrowing and move it in the property itself. Differential Revision: https://phab.mercurial-scm.org/D10959
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Sun, 04 Jul 2021 01:14:15 +0200
parents b8ffe85e399b
children 8bcae9bf9e8d
line wrap: on
line diff
--- a/mercurial/pure/parsers.py	Sat Jul 03 20:34:09 2021 +0200
+++ b/mercurial/pure/parsers.py	Sun Jul 04 01:14:15 2021 +0200
@@ -98,9 +98,11 @@
     def from_p2(self):
         """True if the file have been fetched from p2 during the current merge
 
+        This is only True is the file is currently tracked.
+
         Should only be set if a merge is in progress in the dirstate
         """
-        return self._size == FROM_P2
+        return self._state == b'n' and self._size == FROM_P2
 
     @property
     def from_p2_removed(self):