This is an archive of the discontinued Mercurial Phabricator instance.

Differential D11523

dirstate-item: introduce a `maybe_clean` property
ClosedPublic

Authored by marmoute on Oct 1 2021, 5:38 AM.

Details

Reviewers
Alphare
Group Reviewers
hg-reviewers
Commits
rHG80783e553bd5: dirstate-item: introduce a `maybe_clean` property
Summary

It is useful for some extension that seek to invalidate some state.

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 1 2021, 5:38 AM
Alphare accepted this revision.Oct 1 2021, 11:17 AM
This revision is now accepted and ready to land.Oct 1 2021, 11:17 AM
Alphare added a comment.Oct 1 2021, 11:26 AM

On second thought, the semantics of this is not obvious from the docstring. Maybe updating it with some examples could make it more obvious.

Alphare requested changes to this revision.Oct 1 2021, 11:26 AM
This revision now requires changes to proceed.Oct 1 2021, 11:26 AM
marmoute requested review of this revision.Oct 1 2021, 11:31 AM
In D11523#176931, @Alphare wrote:

On second thought, the semantics of this is not obvious from the docstring. Maybe updating it with some examples could make it more obvious.

I can follow up with clarification later if that is fine by you.

Alphare accepted this revision.Oct 1 2021, 11:31 AM

Sure, that makes for less churn.

This revision is now accepted and ready to land.Oct 1 2021, 11:31 AM
marmoute added a commit: rHG80783e553bd5: dirstate-item: introduce a `maybe_clean` property.Oct 1 2021, 4:45 PM
Closed by commit rHG80783e553bd5: dirstate-item: introduce a `maybe_clean` property (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 30523

mercurial/cext/parsers.c

{ {
if (dirstate_item_c_from_p2(self)) { if (dirstate_item_c_from_p2(self)) {
Py_RETURN_TRUE; Py_RETURN_TRUE;
} else { } else {
Py_RETURN_FALSE; Py_RETURN_FALSE;
} }
}; };
static PyObject *dirstate_item_get_maybe_clean(dirstateItemObject *self)
{
if (!(self->flags & dirstate_flag_wc_tracked)) {
Py_RETURN_FALSE;
} else if (dirstate_item_c_added(self)) {
Py_RETURN_FALSE;
} else if (self->flags & dirstate_flag_merged) {
Py_RETURN_FALSE;
} else if (self->flags & dirstate_flag_clean_p2) {
Py_RETURN_FALSE;
} else {
Py_RETURN_TRUE;
}
};
static PyObject *dirstate_item_get_removed(dirstateItemObject *self) static PyObject *dirstate_item_get_removed(dirstateItemObject *self)
{ {
if (dirstate_item_c_removed(self)) { if (dirstate_item_c_removed(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},
{"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",
NULL},
{"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL}, {"removed", (getter)dirstate_item_get_removed, NULL, "removed", NULL},
{NULL} /* Sentinel */ {NULL} /* Sentinel */
}; };
PyTypeObject dirstateItemType = { PyTypeObject dirstateItemType = {
PyVarObject_HEAD_INIT(NULL, 0) /* header */ PyVarObject_HEAD_INIT(NULL, 0) /* header */
"dirstate_tuple", /* tp_name */ "dirstate_tuple", /* tp_name */
sizeof(dirstateItemObject), /* tp_basicsize */ sizeof(dirstateItemObject), /* tp_basicsize */

mercurial/pure/parsers.py

return self._wc_tracked return self._wc_tracked
@property @property
def added(self): def added(self):
"""True if the file has been added""" """True if the file has been added"""
return self._wc_tracked and not (self._p1_tracked or self._p2_tracked) return self._wc_tracked and not (self._p1_tracked or self._p2_tracked)
@property @property
def maybe_clean(self):
"""True if the file has a chance to be in the "clean" state"""
if not self._wc_tracked:
return False
elif self.added:
return False
elif self._merged:
return False
elif self._clean_p2:
return False
return True
@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._merged return self._wc_tracked and self._merged
@property @property

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

self.flags.contains(Flags::WDIR_TRACKED) self.flags.contains(Flags::WDIR_TRACKED)
&& !self.tracked_in_any_parent() && !self.tracked_in_any_parent()
} }
pub fn from_p2(&self) -> bool { pub fn from_p2(&self) -> bool {
self.flags.contains(Flags::WDIR_TRACKED | Flags::CLEAN_P2) self.flags.contains(Flags::WDIR_TRACKED | Flags::CLEAN_P2)
} }
pub fn maybe_clean(&self) -> bool {
if !self.flags.contains(Flags::WDIR_TRACKED) {
false
} else if self.added() {
false
} else if self.flags.contains(Flags::MERGED) {
false
} else if self.flags.contains(Flags::CLEAN_P2) {
false
} else {
true
}
}
pub fn state(&self) -> EntryState { pub fn state(&self) -> EntryState {
if self.removed() { if self.removed() {
EntryState::Removed EntryState::Removed
} else if self.merged() { } else if self.merged() {
EntryState::Merged EntryState::Merged
} else if self.added() { } else if self.added() {
EntryState::Added EntryState::Added
} else { } else {

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

Ok(self.entry(py).get().removed()) Ok(self.entry(py).get().removed())
} }
@property @property
def from_p2(&self) -> PyResult<bool> { def from_p2(&self) -> PyResult<bool> {
Ok(self.entry(py).get().from_p2()) Ok(self.entry(py).get().from_p2())
} }
@property
def maybe_clean(&self) -> PyResult<bool> {
Ok(self.entry(py).get().maybe_clean())
}
def v1_state(&self) -> PyResult<PyBytes> { def v1_state(&self) -> PyResult<PyBytes> {
let (state, _mode, _size, _mtime) = self.entry(py).get().v1_data(); let (state, _mode, _size, _mtime) = self.entry(py).get().v1_data();
let state_byte: u8 = state.into(); let state_byte: u8 = state.into();
Ok(PyBytes::new(py, &[state_byte])) Ok(PyBytes::new(py, &[state_byte]))
} }
def v1_mode(&self) -> PyResult<i32> { def v1_mode(&self) -> PyResult<i32> {
let (_state, mode, _size, _mtime) = self.entry(py).get().v1_data(); let (_state, mode, _size, _mtime) = self.entry(py).get().v1_data();