This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11585

dirstate-item: introduce a `p2_info` property that combine two others
ClosedPublic

Authored by marmoute on Oct 2 2021, 8:26 PM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHGfb3b41d583c2: dirstate-item: introduce a `p2_info` property that combine two others
Summary

The merged and from_p2 property are always used together so we can expose a
combined property instead.

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.Oct 2 2021, 8:26 PM
baymax updated this revision to Diff 30591.Oct 3 2021, 6:50 AM

✅ refresh by Heptapod after a successful CI run (🐙 💚)

Alphare accepted this revision.Oct 3 2021, 5:10 PM
This revision is now accepted and ready to land.Oct 3 2021, 5:10 PM

Revision Contents
Changeset List

Diff 30644

mercurial/cext/parsers.c

{ {
if (dirstate_item_c_added(self)) { if (dirstate_item_c_added(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_p2_info(dirstateItemObject *self)
{
if (self->flags & dirstate_flag_wc_tracked &&
self->flags & dirstate_flag_p2_info) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstate_item_get_merged(dirstateItemObject *self) static PyObject *dirstate_item_get_merged(dirstateItemObject *self)
{ {
if (dirstate_item_c_merged(self)) { if (dirstate_item_c_merged(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyGetSetDef dirstate_item_getset[] = { static PyGetSetDef dirstate_item_getset[] = {
{"mode", (getter)dirstate_item_get_mode, NULL, "mode", NULL}, {"mode", (getter)dirstate_item_get_mode, NULL, "mode", NULL},
{"size", (getter)dirstate_item_get_size, NULL, "size", NULL}, {"size", (getter)dirstate_item_get_size, NULL, "size", NULL},
{"mtime", (getter)dirstate_item_get_mtime, NULL, "mtime", NULL}, {"mtime", (getter)dirstate_item_get_mtime, NULL, "mtime", NULL},
{"state", (getter)dirstate_item_get_state, NULL, "state", NULL}, {"state", (getter)dirstate_item_get_state, NULL, "state", NULL},
{"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL}, {"tracked", (getter)dirstate_item_get_tracked, NULL, "tracked", NULL},
{"added", (getter)dirstate_item_get_added, NULL, "added", NULL}, {"added", (getter)dirstate_item_get_added, NULL, "added", NULL},
{"p2_info", (getter)dirstate_item_get_p2_info, NULL, "p2_info", NULL},
{"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL}, {"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},
{"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL}, {"from_p2", (getter)dirstate_item_get_from_p2, NULL, "from_p2", NULL},
{"maybe_clean", (getter)dirstate_item_get_maybe_clean, NULL, "maybe_clean", {"maybe_clean", (getter)dirstate_item_get_maybe_clean, NULL, "maybe_clean",
NULL}, NULL},
{"any_tracked", (getter)dirstate_item_get_any_tracked, NULL, "any_tracked", {"any_tracked", (getter)dirstate_item_get_any_tracked, NULL, "any_tracked",
NULL}, NULL},
{"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL}, {"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
{NULL} /* Sentinel */ {NULL} /* Sentinel */

mercurial/pure/parsers.py

return False return False
elif not self._p1_tracked: elif not self._p1_tracked:
return False return False
elif self._p2_info: elif self._p2_info:
return False return False
return True return True
@property @property
def p2_info(self):
"""True if the file needed to merge or apply any input from p2
See the class documentation for details.
"""
return self._wc_tracked and self._p2_info
@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._wc_tracked and self._p1_tracked and self._p2_info return self._wc_tracked and self._p1_tracked and self._p2_info
@property @property

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

fn in_either_parent(&self) -> bool { fn in_either_parent(&self) -> bool {
self.flags.intersects(Flags::P1_TRACKED | Flags::P2_INFO) self.flags.intersects(Flags::P1_TRACKED | Flags::P2_INFO)
} }
pub fn removed(&self) -> bool { pub fn removed(&self) -> bool {
self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED) self.in_either_parent() && !self.flags.contains(Flags::WDIR_TRACKED)
} }
pub fn p2_info(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED | Flags::P2_INFO)
}
pub fn merged(&self) -> bool { pub fn merged(&self) -> bool {
self.flags self.flags
.contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO) .contains(Flags::WDIR_TRACKED | Flags::P1_TRACKED | Flags::P2_INFO)
} }
pub fn added(&self) -> bool { pub fn added(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent() self.flags.contains(Flags::WDIR_TRACKED) && !self.in_either_parent()
} }

rust/hg-cpython/src/dirstate/item.rs

Ok(self.entry(py).get().tracked()) Ok(self.entry(py).get().tracked())
} }
@property @property
def added(&self) -> PyResult<bool> { def added(&self) -> PyResult<bool> {
Ok(self.entry(py).get().added()) Ok(self.entry(py).get().added())
} }
@property
def p2_info(&self) -> PyResult<bool> {
Ok(self.entry(py).get().p2_info())
}
@property @property
def merged(&self) -> PyResult<bool> { def merged(&self) -> PyResult<bool> {
Ok(self.entry(py).get().merged()) Ok(self.entry(py).get().merged())
} }
@property @property
def removed(&self) -> PyResult<bool> { def removed(&self) -> PyResult<bool> {
Ok(self.entry(py).get().removed()) Ok(self.entry(py).get().removed())