Mercurial > public > mercurial-scm > hg-stable

diff mercurial/pure/parsers.py @ 48081:7a2de2bd9fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: inline the `from_p2_removed` logic It is used internally for compatibilty with size used in the `v1` format, but this is the only use. So we can simply inline it. Differential Revision: https://phab.mercurial-scm.org/D11514
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Tue, 28 Sep 2021 19:29:44 +0200
parents 870100c0209b
children d3eb5f50052c
line wrap: on
line diff
--- a/mercurial/pure/parsers.py	Tue Sep 28 19:15:46 2021 +0200
+++ b/mercurial/pure/parsers.py	Tue Sep 28 19:29:44 2021 +0200
@@ -379,7 +379,7 @@
             raise RuntimeError('untracked item')
         elif self.removed and self._merged:
             return NONNORMAL
-        elif self.from_p2_removed:
+        elif self.removed and self._clean_p2:
             return FROM_P2
         elif self.removed:
             return 0