Mercurial > public > mercurial-scm > hg

comparison mercurial/pure/parsers.py @ 47686:e43128ee436f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate-item: introduce a `dm_otherparent` property See inline documentation for details. Differential Revision: https://phab.mercurial-scm.org/D11124
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 14 Jul 2021 22:06:13 +0200
parents 265cdfaad372
children 3853e6ee160d
comparison
equal deleted inserted replaced
47685:265cdfaad372 47686:e43128ee436f
192 """True is the entry is non-normal in the dirstatemap sense 192 """True is the entry is non-normal in the dirstatemap sense
193 193
194 There is no reason for any code, but the dirstatemap one to use this. 194 There is no reason for any code, but the dirstatemap one to use this.
195 """ 195 """
196 return self.state != b'n' or self.mtime == AMBIGUOUS_TIME 196 return self.state != b'n' or self.mtime == AMBIGUOUS_TIME
197
198 @property
199 def dm_otherparent(self):
200 """True is the entry is `otherparent` in the dirstatemap sense
201
202 There is no reason for any code, but the dirstatemap one to use this.
203 """
204 return self._size == FROM_P2
197 205
198 def v1_state(self): 206 def v1_state(self):
199 """return a "state" suitable for v1 serialization""" 207 """return a "state" suitable for v1 serialization"""
200 return self._state 208 return self._state
201 209