Mercurial > public > mercurial-scm > hg
comparison mercurial/pure/parsers.py @ 47935:97e9f3fd9324
dirstate-item: add more logic to `from_p2`
This seem semantically better even if this tracking case seems to always comes
with clean_p2 for now.
Differential Revision: https://phab.mercurial-scm.org/D11372
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 27 Aug 2021 18:04:49 +0200 |
| parents | f94cc63df859 |
| children | 0d185f73c619 |
comparison
equal
deleted
inserted
replaced
| 47934:f94cc63df859 | 47935:97e9f3fd9324 |
|---|---|
| 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._wc_tracked and self._clean_p2 | 289 if not self._wc_tracked: |
| 290 return False | |
| 291 return self._clean_p2 or (not self._p1_tracked and self._p2_tracked) | |
| 290 | 292 |
| 291 @property | 293 @property |
| 292 def from_p2_removed(self): | 294 def from_p2_removed(self): |
| 293 """True if the file has been removed, but was "from_p2" initially | 295 """True if the file has been removed, but was "from_p2" initially |
| 294 | 296 |