Mercurial > public > mercurial-scm > hg

diff mercurial/pure/parsers.py @ 48149:6ac2b417d5d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: directly use `p2_info` in `v1_size` This is simpler. Differential Revision: https://phab.mercurial-scm.org/D11593
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Fri, 01 Oct 2021 03:24:57 +0200
parents 21542d4cb568
children d71feb05d5b6
line wrap: on
line diff
--- a/mercurial/pure/parsers.py	Fri Oct 01 04:04:38 2021 +0200
+++ b/mercurial/pure/parsers.py	Fri Oct 01 03:24:57 2021 +0200
@@ -363,16 +363,12 @@
             raise RuntimeError('untracked item')
         elif self.removed and self._p1_tracked and self._p2_info:
             return NONNORMAL
-        elif self.removed and self._p2_info:
+        elif self._p2_info:
             return FROM_P2
         elif self.removed:
             return 0
-        elif self.merged:
-            return FROM_P2
         elif self.added:
             return NONNORMAL
-        elif self.from_p2:
-            return FROM_P2
         elif self._size is None:
             return NONNORMAL
         else: