This is an archive of the discontinued Mercurial Phabricator instance.

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.

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

			Path	Packages
M			mercurial/cext/parsers.c (17 lines)
M			mercurial/pure/parsers.py (13 lines)
M			rust/hg-core/src/dirstate/entry.rs (14 lines)
M			rust/hg-cpython/src/dirstate/item.rs (5 lines)

Commit	Parents	Author	Summary	Date
20a14484f009	7ef29ee32d69	Pierre-Yves David		Sep 29 2021, 8:41 AM

Status	Author	Revision
Abandoned	marmoute	D11556 dirstate: push back the future a bit in the test
Abandoned	marmoute	D11555 dirstate-item: point out that `merged` is set only with p1_tracked
Abandoned	marmoute	D11554 dirstate-item: update the attribute documentation
Abandoned	marmoute	D11553 dirstate-item: use `any_tracked` more
Abandoned	marmoute	D11552 dirstate-item: drop an outdated comments
Abandoned	marmoute	D11551 dirstate: remove a update_file's special case for `merged` file
Abandoned	marmoute	D11550 dirstate: remove a update_file's special case for tracked file with p2 data
Closed	marmoute	D11544 dirstate: deprecate `__getitem__` access
Closed	marmoute	D11543 dirstate-item: use item's property instead of `state` in largefile
Closed	marmoute	D11542 dirstate-item: use `added` instead of `state` when moving dirstate
Closed	marmoute	D11541 dirstate-item: use item's property instead of `state` in revert
Closed	marmoute	D11540 dirstate-item: use item's property when computing a copies
Closed	marmoute	D11539 dirstate-item: use item's property instead of `state` in copy
Closed	marmoute	D11538 dirstate-item: use `added` in debugrebuilddirstate
Closed	marmoute	D11537 dirstate-item: use `maybe_clean` instead of `state` in record
Closed	marmoute	D11536 dirstate-item: use `any_tracked` instead of `state` to apply patches
Closed	marmoute	D11535 dirstate-item: use item's property instead of `state` in addremove
Closed	marmoute	D11534 dirstate-item: use `tracked` instead of `state` during copy detection
Closed	marmoute	D11533 dirstate-item: use `maybe_clean` instead of `state` in `strip`
Closed	marmoute	D11532 dirstate-item: use `tracked` instead of `state` in context.matches
Closed	marmoute	D11531 dirstate-item: use `tracked` instead of the `state` in context's iter
Closed	marmoute	D11530 dirstate-item: use `tracked` instead of the `state` in context
Closed	marmoute	D11529 dirstate-item: use item's property to deal with hgsubstate in mq
Closed	marmoute	D11528 dirstate-item: use `added` instead of the `state` in the `mq` extension
Closed	marmoute	D11527 dirstate-item: use maybe_clean instead of `state` in the eol extension
Closed	marmoute	D11526 dirstate: move verification code within the dirstate itself
Closed	marmoute	D11525 dirstate-entry: use `?` for the state of entry without any tracking
Closed	marmoute	D11524 dirstate-item: introduce a `any_tracked` property
Closed	marmoute	D11523 dirstate-item: introduce a `maybe_clean` property
Closed	marmoute	D11522 dirstate: add a `get_entry` method to the dirstate
Closed	marmoute	D11521 dirstate-item: Make constructor parameters optional

Diff 30450

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();

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30450		Oct 1 2021, 5:38 AM	★	★
Diff 2	30523	rHG80783e553bd57bd9581a497644b7fb7c17024c95	Sep 29 2021, 8:41 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: introduce a `maybe_clean` propertyClosedPublic

Details

Diff Detail

Event Timeline