| Alphare |
| hg-reviewers |
We are about to change the internal attribute. Having all the logic using the
old "legacy" accessors will help to have a smooth transition.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/pure/parsers.py (28 lines) |
| size = FROM_P2 | size = FROM_P2 | ||||
| self._state = b'r' | self._state = b'r' | ||||
| self._mode = 0 | self._mode = 0 | ||||
| self._size = size | self._size = size | ||||
| self._mtime = 0 | self._mtime = 0 | ||||
| @property | @property | ||||
| def mode(self): | def mode(self): | ||||
| return self._mode | return self.v1_mode() | ||||
| @property | @property | ||||
| def size(self): | def size(self): | ||||
| return self._size | return self.v1_size() | ||||
| @property | @property | ||||
| def mtime(self): | def mtime(self): | ||||
| return self._mtime | return self.v1_mtime() | ||||
| @property | @property | ||||
| def state(self): | def state(self): | ||||
| """ | """ | ||||
| States are: | States are: | ||||
| n normal | n normal | ||||
| m needs merging | m needs merging | ||||
| r marked for removal | r marked for removal | ||||
| a marked for addition | a marked for addition | ||||
| XXX This "state" is a bit obscure and mostly a direct expression of the | 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 | dirstatev1 format. It would make sense to ultimately deprecate it in | ||||
| favor of the more "semantic" attributes. | favor of the more "semantic" attributes. | ||||
| """ | """ | ||||
| return self._state | return self.v1_state() | ||||
| @property | @property | ||||
| def tracked(self): | def tracked(self): | ||||
| """True is the file is tracked in the working copy""" | """True is the file is tracked in the working copy""" | ||||
| return self._state in b"nma" | return self.v1_state() in b"nma" | ||||
| @property | @property | ||||
| def added(self): | def added(self): | ||||
| """True if the file has been added""" | """True if the file has been added""" | ||||
| return self._state == b'a' | return self.v1_state() == b'a' | ||||
| @property | @property | ||||
| def merged(self): | def merged(self): | ||||
| """True if the file has been merged | """True if the file has been merged | ||||
| Should only be set if a merge is in progress in the dirstate | 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 | @property | ||||
| def from_p2(self): | def from_p2(self): | ||||
| """True if the file have been fetched from p2 during the current merge | """True if the file have been fetched from p2 during the current merge | ||||
| This is only True is the file is currently tracked. | This is only True is the file is currently tracked. | ||||
| Should only be set if a merge is in progress in the dirstate | 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 | @property | ||||
| def from_p2_removed(self): | def from_p2_removed(self): | ||||
| """True if the file has been removed, but was "from_p2" initially | """True if the file has been removed, but was "from_p2" initially | ||||
| This property seems like an abstraction leakage and should probably be | This property seems like an abstraction leakage and should probably be | ||||
| dealt in this class (or maybe the dirstatemap) directly. | 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 | @property | ||||
| def removed(self): | def removed(self): | ||||
| """True if the file has been removed""" | """True if the file has been removed""" | ||||
| return self._state == b'r' | return self.v1_state() == b'r' | ||||
| @property | @property | ||||
| def merged_removed(self): | def merged_removed(self): | ||||
| """True if the file has been removed, but was "merged" initially | """True if the file has been removed, but was "merged" initially | ||||
| This property seems like an abstraction leakage and should probably be | This property seems like an abstraction leakage and should probably be | ||||
| dealt in this class (or maybe the dirstatemap) directly. | 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 | @property | ||||
| def dm_nonnormal(self): | def dm_nonnormal(self): | ||||
| """True is the entry is non-normal in the dirstatemap sense | """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. | 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 | @property | ||||
| def dm_otherparent(self): | def dm_otherparent(self): | ||||
| """True is the entry is `otherparent` in the dirstatemap sense | """True is the entry is `otherparent` in the dirstatemap sense | ||||
| There is no reason for any code, but the dirstatemap one to use this. | 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): | def v1_state(self): | ||||
| """return a "state" suitable for v1 serialization""" | """return a "state" suitable for v1 serialization""" | ||||
| return self._state | return self._state | ||||
| def v1_mode(self): | def v1_mode(self): | ||||
| """return a "mode" suitable for v1 serialization""" | """return a "mode" suitable for v1 serialization""" | ||||
| return self._mode | return self._mode | ||||
| def v1_size(self): | def v1_size(self): | ||||
| """return a "size" suitable for v1 serialization""" | """return a "size" suitable for v1 serialization""" | ||||
| return self._size | return self._size | ||||
| def v1_mtime(self): | def v1_mtime(self): | ||||
| """return a "mtime" suitable for v1 serialization""" | """return a "mtime" suitable for v1 serialization""" | ||||
| return self._mtime | return self._mtime | ||||
| def need_delay(self, now): | def need_delay(self, now): | ||||
| """True if the stored mtime would be ambiguous with the current time""" | """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): | def gettype(q): | ||||
| return int(q & 0xFFFF) | return int(q & 0xFFFF) | ||||
| class BaseIndexObject(object): | class BaseIndexObject(object): | ||||
| # Can I be passed to an algorithme implemented in Rust ? | # Can I be passed to an algorithme implemented in Rust ? | ||||