This is an archive of the discontinued Mercurial Phabricator instance.

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

Commit	Parents	Author	Summary	Date
bd21b3b11e9a	885a4fed2831	Pierre-Yves David		Sep 28 2021, 1:15 PM

Status	Author	Revision
Closed	SimonSapin	D11517 dirstate: Remove the Rust abstraction DirstateMapMethods
Closed	SimonSapin	D11516 dirstate: Remove the flat Rust DirstateMap implementation
Closed	marmoute	D11515 dirstate: drop the from_p2_removed method
Closed	marmoute	D11514 dirstate: inline the `from_p2_removed` logic
Closed	marmoute	D11513 dirstate: drop the merged_removed method
Closed	marmoute	D11512 dirstate: inline the merged_removed logic
Closed	marmoute	D11511 dirstate: drop some safety assert in largefile
Closed	marmoute	D11510 dirstate: drop unused condition in `from_p2`
Closed	SimonSapin	D11507 dirstate: drop all logic around the "non-normal" sets
Closed	SimonSapin	D11506 dirstate: use a new `drop_merge_data` in `setparent`
Closed	SimonSapin	D11505 dirstate: move parent state handling in the dirstatemap
Closed	SimonSapin	D11504 dirstate: stop checking for path collision when adjusting parents
Closed	SimonSapin	D11503 dirstate: drop the `_updatedfiles` set
Closed	SimonSapin	D11502 dirstate: drop the `clearambiguoustimes` method for the map
Closed	SimonSapin	D11501 dirstate: simplify the ambiguity clearing at write time

Diff 30436

mercurial/cext/parsers.c

	}			}

	static inline bool dirstate_item_c_merged(dirstateItemObject *self)			static inline bool dirstate_item_c_merged(dirstateItemObject *self)
	{			{
	return ((self->flags & dirstate_flag_wc_tracked) &&			return ((self->flags & dirstate_flag_wc_tracked) &&
	(self->flags & dirstate_flag_merged));			(self->flags & dirstate_flag_merged));
	}			}

	static inline bool dirstate_item_c_merged_removed(dirstateItemObject *self)
	{
	if (!dirstate_item_c_removed(self)) {
	return false;
	}
	return (self->flags & dirstate_flag_merged);
	}

	static inline bool dirstate_item_c_from_p2(dirstateItemObject *self)			static inline bool dirstate_item_c_from_p2(dirstateItemObject *self)
	{			{
	if (!dirstate_item_c_tracked(self)) {			if (!dirstate_item_c_tracked(self)) {
	return false;			return false;
	}			}
	return (self->flags & dirstate_flag_clean_p2);			return (self->flags & dirstate_flag_clean_p2);
	}			}

	{			{
	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 PyObject dirstate_item_get_merged_removed(dirstateItemObject self)
	{
	if (dirstate_item_c_merged_removed(self)) {
	Py_RETURN_TRUE;
	} else {
	Py_RETURN_FALSE;
	}
	};

	static PyObject dirstate_item_get_from_p2(dirstateItemObject self)			static PyObject dirstate_item_get_from_p2(dirstateItemObject self)
	{			{
	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 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_removed", (getter)dirstate_item_get_merged_removed, NULL,
	"merged_removed", NULL},
	{"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},			{"merged", (getter)dirstate_item_get_merged, NULL, "merged", NULL},
	{"from_p2_removed", (getter)dirstate_item_get_from_p2_removed, NULL,			{"from_p2_removed", (getter)dirstate_item_get_from_p2_removed, NULL,
	"from_p2_removed", NULL},			"from_p2_removed", 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},
	{"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 self.removed and self._clean_p2			return self.removed and self._clean_p2

	@property			@property
	def removed(self):			def removed(self):
	"""True if the file has been removed"""			"""True if the file has been removed"""
	return not self._wc_tracked and (self._p1_tracked or self._p2_tracked)			return not self._wc_tracked and (self._p1_tracked or self._p2_tracked)

	@property
	def merged_removed(self):
	"""True if the file has been removed, but was "merged" initially

	This property seems like an abstraction leakage and should probably be
	dealt in this class (or maybe the dirstatemap) directly.
	"""
	return self.removed and self._merged

	def v1_state(self):			def v1_state(self):
	"""return a "state" suitable for v1 serialization"""			"""return a "state" 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:			elif self.removed:
	return b'r'			return b'r'

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

	self.flags.intersects(Flags::P1_TRACKED \| Flags::P2_TRACKED)			self.flags.intersects(Flags::P1_TRACKED \| Flags::P2_TRACKED)
	}			}

	pub fn removed(&self) -> bool {			pub fn removed(&self) -> bool {
	self.tracked_in_any_parent()			self.tracked_in_any_parent()
	&& !self.flags.contains(Flags::WDIR_TRACKED)			&& !self.flags.contains(Flags::WDIR_TRACKED)
	}			}

	pub fn merged_removed(&self) -> bool {
	self.removed() && self.flags.contains(Flags::MERGED)
	}

	pub fn from_p2_removed(&self) -> bool {			pub fn from_p2_removed(&self) -> bool {
	self.removed() && self.flags.contains(Flags::CLEAN_P2)			self.removed() && self.flags.contains(Flags::CLEAN_P2)
	}			}

	pub fn merged(&self) -> bool {			pub fn merged(&self) -> bool {
	self.flags.contains(Flags::WDIR_TRACKED \| Flags::MERGED)			self.flags.contains(Flags::WDIR_TRACKED \| Flags::MERGED)
	}			}

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

	}			}

	@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			@property
	def merged_removed(&self) -> PyResult<bool> {
	Ok(self.entry(py).get().merged_removed())
	}

	@property
	def from_p2_removed(&self) -> PyResult<bool> {			def from_p2_removed(&self) -> PyResult<bool> {
	Ok(self.entry(py).get().from_p2_removed())			Ok(self.entry(py).get().from_p2_removed())
	}			}

	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]))

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30436		Sep 29 2021, 4:36 AM	★	★
Diff 2	30483	rHG870100c0209b02e492a2ae42d970123656d91816	Sep 28 2021, 1:15 PM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate: drop the merged_removed methodClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30436

mercurial/cext/parsers.c

mercurial/pure/parsers.py

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

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

dirstate: drop the merged_removed method
ClosedPublic

Revision Contents
Changeset List