Mercurial > public > mercurial-scm > hg-stable
diff mercurial/pure/parsers.py @ 48154:fb3b41d583c2
dirstate-item: introduce a `p2_info` property that combine two others
The `merged` and `from_p2` property are always used together so we can expose a
combined property instead.
Differential Revision: https://phab.mercurial-scm.org/D11585
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 01 Oct 2021 04:04:09 +0200 |
| parents | 38488d488ec1 |
| children | 21542d4cb568 |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Fri Oct 01 02:01:12 2021 +0200 +++ b/mercurial/pure/parsers.py Fri Oct 01 04:04:09 2021 +0200 @@ -301,6 +301,14 @@ return True @property + def p2_info(self): + """True if the file needed to merge or apply any input from p2 + + See the class documentation for details. + """ + return self._wc_tracked and self._p2_info + + @property def merged(self): """True if the file has been merged