Mercurial > hg
diff mercurial/pure/parsers.py @ 48062:46d1b75648f4
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
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Tue, 28 Sep 2021 18:29:57 +0200 |
parents | 060cd909439f |
children | 2943955304b3 |
line wrap: on
line diff
--- 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):