mercurial-scm/hg: mercurial/pure/parsers.py comparison

comparison mercurial/pure/parsers.py @ 47926:05f2be3affe3

dirstate-item: have all the logic go through the v1_ accessors We are about to change the internal attribute. Having all the logic using the old "legacy" accessors will help to have a smooth transition. Differential Revision: https://phab.mercurial-scm.org/D11363

author	Pierre-Yves David <pierre-yves.david@octobus.net>
date	Thu, 26 Aug 2021 16:50:14 +0200
parents	ba9491be5e0c
children	b81f52ca8075

comparison

equal deleted inserted replaced

-:ba9491be5e0c
+:05f2be3affe3
 self._size = size
 self._mtime = 0
 @property
 def mode(self):
-return self._mode
+return self.v1_mode()
 @property
 def size(self):
-return self._size
+return self.v1_size()
 @property
 def mtime(self):
-return self._mtime
+return self.v1_mtime()
 @property
 def state(self):
 """
 States are:
 XXX This "state" is a bit obscure and mostly a direct expression of the
 dirstatev1 format. It would make sense to ultimately deprecate it in
 favor of the more "semantic" attributes.
 """
-return self._state
+return self.v1_state()
 @property
 def tracked(self):
 """True is the file is tracked in the working copy"""
-return self._state in b"nma"
+return self.v1_state() in b"nma"
 @property
 def added(self):
 """True if the file has been added"""
-return self._state == b'a'
+return self.v1_state() == b'a'
 @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'
+return self.v1_state() == b'm'
 @property
 def from_p2(self):
 """True if the file have been fetched from p2 during the current merge
 This is only True is the file is currently tracked.
 Should only be set if a merge is in progress in the dirstate
 """
-return self._state == b'n' and self._size == FROM_P2
+return self.v1_state() == b'n' and self.v1_size() == FROM_P2
 @property
 def from_p2_removed(self):
 """True if the file has been removed, but was "from_p2" initially
 This property seems like an abstraction leakage and should probably be
 dealt in this class (or maybe the dirstatemap) directly.
 """
-return self._state == b'r' and self._size == FROM_P2
+return self.v1_state() == b'r' and self.v1_size() == FROM_P2
 @property
 def removed(self):
 """True if the file has been removed"""
-return self._state == b'r'
+return self.v1_state() == b'r'
 @property
 def merged_removed(self):
 """True if the file has been removed, but was "merged" initially
 This property seems like an abstraction leakage and should probably be
 dealt in this class (or maybe the dirstatemap)  directly.
 """
-return self._state == b'r' and self._size == NONNORMAL
+return self.v1_state() == b'r' and self.v1_size() == NONNORMAL
 @property
 def dm_nonnormal(self):
 """True is the entry is non-normal in the dirstatemap sense
 There is no reason for any code, but the dirstatemap one to use this.
 """
-return self.state != b'n' or self.mtime == AMBIGUOUS_TIME
+return self.v1_state() != b'n' or self.v1_mtime() == AMBIGUOUS_TIME
 @property
 def dm_otherparent(self):
 """True is the entry is `otherparent` in the dirstatemap sense
 There is no reason for any code, but the dirstatemap one to use this.
 """
-return self._size == FROM_P2
+return self.v1_size() == FROM_P2
 def v1_state(self):
 """return a "state" suitable for v1 serialization"""
 return self._state
 """return a "mtime" suitable for v1 serialization"""
 return self._mtime
 def need_delay(self, now):
 """True if the stored mtime would be ambiguous with the current time"""
-return self._state == b'n' and self._mtime == now
+return self.v1_state() == b'n' and self.v1_mtime() == now
 def gettype(q):
 return int(q & 0xFFFF)

Mercurial > public > mercurial-scm > hg

comparison mercurial/pure/parsers.py @ 47926:05f2be3affe3