This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11514

dirstate: inline the `from_p2_removed` logic
ClosedPublic

Authored by marmoute on Sep 29 2021, 4:36 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG7a2de2bd9fcd: dirstate: inline the `from_p2_removed` logic
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

marmoute created this revision.Sep 29 2021, 4:36 AM
Alphare accepted this revision.Sep 29 2021, 4:58 AM
This revision is now accepted and ready to land.Sep 29 2021, 4:58 AM
marmoute added a commit: rHG7a2de2bd9fcd: dirstate: inline the `from_p2_removed` logic.Oct 1 2021, 9:19 AM
Closed by commit rHG7a2de2bd9fcd: dirstate: inline the `from_p2_removed` logic (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30484

mercurial/cext/parsers.c

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_removed(self) && if (dirstate_item_c_removed(self) &&
(self->flags & dirstate_flag_merged)) { (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_removed(self) &&
(self->flags & dirstate_flag_clean_p2)) {
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 dirstate_v1_nonnormal; return dirstate_v1_nonnormal;
} else if (dirstate_item_c_from_p2(self)) { } else if (dirstate_item_c_from_p2(self)) {

mercurial/pure/parsers.py

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.removed and self._merged: elif self.removed and self._merged:
return NONNORMAL return NONNORMAL
elif self.from_p2_removed: elif self.removed and self._clean_p2:
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:
return NONNORMAL return NONNORMAL
elif self.from_p2: elif self.from_p2:

rust/hg-core/src/dirstate/entry.rs

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.removed() && self.flags.contains(Flags::MERGED) { if self.removed() && self.flags.contains(Flags::MERGED) {
SIZE_NON_NORMAL SIZE_NON_NORMAL
} else if self.from_p2_removed() { } else if self.removed() && self.flags.contains(Flags::CLEAN_P2) {
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() {
SIZE_NON_NORMAL SIZE_NON_NORMAL
} else if self.from_p2() { } else if self.from_p2() {