| Alphare |
| hg-reviewers |
It is used internally for compatibilty with size used in the v1 format, but
this is the only use. So we can simply inline it.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/cext/parsers.c (3 lines) | |||
| M | mercurial/pure/parsers.py (2 lines) | |||
| M | rust/hg-core/src/dirstate/entry.rs (2 lines) |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | marmoute | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin | ||
| Closed | SimonSapin |
| static inline int dirstate_item_c_v1_mode(dirstateItemObject *self) | static inline int dirstate_item_c_v1_mode(dirstateItemObject *self) | ||||
| { | { | ||||
| return self->mode; | return self->mode; | ||||
| } | } | ||||
| static inline int dirstate_item_c_v1_size(dirstateItemObject *self) | static inline int dirstate_item_c_v1_size(dirstateItemObject *self) | ||||
| { | { | ||||
| if (dirstate_item_c_merged_removed(self)) { | if (dirstate_item_c_removed(self) && | ||||
| (self->flags & dirstate_flag_merged)) { | |||||
| return dirstate_v1_nonnormal; | return dirstate_v1_nonnormal; | ||||
| } else if (dirstate_item_c_from_p2_removed(self)) { | } else if (dirstate_item_c_from_p2_removed(self)) { | ||||
| return dirstate_v1_from_p2; | return dirstate_v1_from_p2; | ||||
| } else if (dirstate_item_c_removed(self)) { | } else if (dirstate_item_c_removed(self)) { | ||||
| return 0; | return 0; | ||||
| } else if (dirstate_item_c_merged(self)) { | } else if (dirstate_item_c_merged(self)) { | ||||
| return dirstate_v1_from_p2; | return dirstate_v1_from_p2; | ||||
| } else if (dirstate_item_c_added(self)) { | } else if (dirstate_item_c_added(self)) { | ||||
| return self._mode if self._mode is not None else 0 | return self._mode if self._mode is not None else 0 | ||||
| def v1_size(self): | def v1_size(self): | ||||
| """return a "size" suitable for v1 serialization""" | """return a "size" suitable for v1 serialization""" | ||||
| if not (self._p1_tracked or self._p2_tracked or self._wc_tracked): | if not (self._p1_tracked or self._p2_tracked or self._wc_tracked): | ||||
| # the object has no state to record, this is -currently- | # the object has no state to record, this is -currently- | ||||
| # unsupported | # unsupported | ||||
| raise RuntimeError('untracked item') | raise RuntimeError('untracked item') | ||||
| elif self.merged_removed: | elif self.removed and self._merged: | ||||
| return NONNORMAL | return NONNORMAL | ||||
| elif self.from_p2_removed: | elif self.from_p2_removed: | ||||
| return FROM_P2 | return FROM_P2 | ||||
| elif self.removed: | elif self.removed: | ||||
| return 0 | return 0 | ||||
| elif self.merged: | elif self.merged: | ||||
| return FROM_P2 | return FROM_P2 | ||||
| elif self.added: | elif self.added: | ||||
| } | } | ||||
| } | } | ||||
| pub fn mode(&self) -> i32 { | pub fn mode(&self) -> i32 { | ||||
| self.mode | self.mode | ||||
| } | } | ||||
| pub fn size(&self) -> i32 { | pub fn size(&self) -> i32 { | ||||
| if self.merged_removed() { | if self.removed() && self.flags.contains(Flags::MERGED) { | ||||
| SIZE_NON_NORMAL | SIZE_NON_NORMAL | ||||
| } else if self.from_p2_removed() { | } else if self.from_p2_removed() { | ||||
| SIZE_FROM_OTHER_PARENT | SIZE_FROM_OTHER_PARENT | ||||
| } else if self.removed() { | } else if self.removed() { | ||||
| 0 | 0 | ||||
| } else if self.merged() { | } else if self.merged() { | ||||
| SIZE_FROM_OTHER_PARENT | SIZE_FROM_OTHER_PARENT | ||||
| } else if self.added() { | } else if self.added() { | ||||