This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11586

dirstate-item: introduce a `p1_tracked` property
ClosedPublic

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

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG21542d4cb568: dirstate-item: introduce a `p1_tracked` property
Summary

It is useful to simplify various conditional that use `any_tracked and not
added`.

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 30592.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
marmoute added a commit: rHG21542d4cb568: dirstate-item: introduce a `p1_tracked` property.Oct 3 2021, 5:34 PM
Closed by commit rHG21542d4cb568: dirstate-item: introduce a `p1_tracked` property (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30645

mercurial/cext/parsers.c

static PyObject *dirstate_item_get_tracked(dirstateItemObject *self) static PyObject *dirstate_item_get_tracked(dirstateItemObject *self)
{ {
if (dirstate_item_c_tracked(self)) { if (dirstate_item_c_tracked(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_p1_tracked(dirstateItemObject *self)
{
if (self->flags & dirstate_flag_p1_tracked) {
Py_RETURN_TRUE;
} else {
Py_RETURN_FALSE;
}
};
static PyObject *dirstate_item_get_added(dirstateItemObject *self) static PyObject *dirstate_item_get_added(dirstateItemObject *self)
{ {
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 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},
{"p1_tracked", (getter)dirstate_item_get_p1_tracked, NULL, "p1_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}, {"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},

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

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

pub fn new_removed(size: i32) -> Self { pub fn new_removed(size: i32) -> Self {
Self::from_v1_data(EntryState::Removed, 0, size, 0) Self::from_v1_data(EntryState::Removed, 0, size, 0)
} }
pub fn tracked(&self) -> bool { pub fn tracked(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED) self.flags.contains(Flags::WDIR_TRACKED)
} }
pub fn p1_tracked(&self) -> bool {
self.flags.contains(Flags::P1_TRACKED)
}
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)
} }

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

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