# HG changeset patch
# User Pierre-Yves David <pierre-yves.david@octobus.net>
# Date 1632846597 -7200
# Node ID 46d1b75648f4ce5239c138c59184168f06f6b536
# Parent  060cd909439f03e70cf51339cce4e5ffd489718a
dirstate: drop unused condition in `from_p2`

This conditional was added (by me) tentatively because "it seemed more
correct", but it is not used anywhere yet, and it is missing from the C and the
Rust implementation. So it seems more consistent to drop it for now.

This effectively backout f94cc63df859c

Differential Revision: https://phab.mercurial-scm.org/D11510

diff -r 060cd909439f -r 46d1b75648f4 mercurial/pure/parsers.py
--- a/mercurial/pure/parsers.py	Tue Sep 28 20:05:37 2021 +0200
+++ b/mercurial/pure/parsers.py	Tue Sep 28 18:29:57 2021 +0200
@@ -336,7 +336,7 @@
         """
         if not self._wc_tracked:
             return False
-        return self._clean_p2 or (not self._p1_tracked and self._p2_tracked)
+        return self._clean_p2
 
     @property
     def from_p2_removed(self):