Mercurial > hg
diff mercurial/pure/parsers.py @ 47513:10e740292dff
dirstate-entry: add a `merged` property
Lets start to define and use more semantic property.
Differential Revision: https://phab.mercurial-scm.org/D10955
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Sat, 03 Jul 2021 04:07:21 +0200 |
parents | 769037a279ec |
children | 559aee84b889 |
line wrap: on
line diff
--- a/mercurial/pure/parsers.py Sun Jul 04 03:29:20 2021 +0200 +++ b/mercurial/pure/parsers.py Sat Jul 03 04:07:21 2021 +0200 @@ -79,6 +79,14 @@ """ return self._state + @property + def merged(self): + """True if the file has been merged + + Should only be set if a merge is in progress in the dirstate + """ + return self._state == b'm' + def v1_state(self): """return a "state" suitable for v1 serialization""" return self._state