Mercurial > hg
comparison mercurial/pure/parsers.py @ 47931:7033d1d5bd18
dirstate-item: implement `from_p2` in a simpler way
We can simply use the underlying attribute.
Differential Revision: https://phab.mercurial-scm.org/D11368
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 27 Aug 2021 17:09:49 +0200 |
parents | 7c37d153c22d |
children | 59eddbaa5bfb |
comparison
equal
deleted
inserted
replaced
47930:7c37d153c22d | 47931:7033d1d5bd18 |
---|---|
284 | 284 |
285 This is only True is the file is currently tracked. | 285 This is only True is the file is currently tracked. |
286 | 286 |
287 Should only be set if a merge is in progress in the dirstate | 287 Should only be set if a merge is in progress in the dirstate |
288 """ | 288 """ |
289 return self.v1_state() == b'n' and self.v1_size() == FROM_P2 | 289 return self._wc_tracked and self._clean_p2 |
290 | 290 |
291 @property | 291 @property |
292 def from_p2_removed(self): | 292 def from_p2_removed(self): |
293 """True if the file has been removed, but was "from_p2" initially | 293 """True if the file has been removed, but was "from_p2" initially |
294 | 294 |