This is an archive of the discontinued Mercurial Phabricator instance.

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30575		Oct 2 2021, 8:25 PM	★	★
Diff 2	30591		Oct 3 2021, 6:50 AM	★	★
Diff 3	30644	rHGfb3b41d583c2a216d93e797f5ad05df7b04c965e	Sep 30 2021, 10:04 PM	★	★

Commit	Parents	Author	Summary	Date
84138fed882b	4bcd43e27b6c	Pierre-Yves David		Sep 30 2021, 10:04 PM

Status	Author	Revision
Closed	SimonSapin	D11546 dirstate-v2: Add internal documentation
Closed	SimonSapin	D11545 dirstate-v2: Move data file info in the docket closer together
Closed	marmoute	D11608 dirstate-item: drop the legacy new_normal constructor
Closed	marmoute	D11607 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11606 dirstate-item: replace a call to new_possibly_dirty
Closed	marmoute	D11605 dirstate-item: drop the legacy new_possibly_dirty constructor
Closed	marmoute	D11604 dirstate-item: replace call to new_possibly_dirty
Closed	marmoute	D11603 dirstate-item: drop the legacy new_from_p2 constructor
Closed	marmoute	D11602 dirstate-item: replace call to new_from_p2
Closed	marmoute	D11601 dirstate-item: drop the legacy new_added constructor
Closed	marmoute	D11600 dirstate-item: replace call to new_added
Closed	marmoute	D11599 dirstate-item: drop the legacy new_merged constructor
Closed	marmoute	D11598 dirstate-item: replace call to new_merged
Closed	marmoute	D11597 dirstate-item: drop the `merged` property
Closed	marmoute	D11596 dirstate-item: replace another usage of `merged`
Closed	marmoute	D11595 dirstate-item: replace a `merged` usage with `from_p2`
Closed	marmoute	D11594 dirstate-item: drop the `from_p2` property
Closed	marmoute	D11593 dirstate-item: directly use `p2_info` in `v1_size`
Closed	marmoute	D11592 dirstate-item: use the `p2_info` property to replace more verbose call
Closed	marmoute	D11591 status: process `from_p2` file the same as `merged` one
Closed	marmoute	D11590 dirstate: drop an incorrect comment
Closed	marmoute	D11589 dirstate: drop some duplicated code
Abandoned	pulkit	D11588 dirstate: drop some duplicated code
Closed	marmoute	D11587 dirstate: align the dirstate's API to the lower level ones
Closed	marmoute	D11586 dirstate-item: introduce a `p1_tracked` property
Closed	marmoute	D11585 dirstate-item: introduce a `p2_info` property that combine two others
Closed	marmoute	D11584 dirstate: narrow gathering of parent data
Closed	marmoute	D11583 dirstate: align the dirstatemap's API to the data change
Closed	marmoute	D11558 dirstate-v2: Store a bitfield on disk instead of v1-like state
Closed	marmoute	D11557 dirstate-item: change the internal storage and constructor value
Closed	marmoute	D11582 dirstatemap: drop legacy method on the dirstatemap wrapper
Closed	marmoute	D11581 dirstatemap: align the Rust wrapper implementation of `setparent`
Closed	marmoute	D11580 dirstatemap: fix copymap.pop in Rust to return the value it pops
Closed	marmoute	D11579 dirstate-item: implement `drop_merge_data` on the Rust DirstateItem
Closed	marmoute	D11578 dirstatemap: use a common implement for reset_state
Closed	marmoute	D11577 dirstatemap: add a common `_drop_entry` method for dirstatemap
Closed	marmoute	D11576 dirstatemap: use common code for set_clean
Closed	marmoute	D11575 dirstatemap: use common code for set_possibly_dirty
Closed	marmoute	D11574 dirstatemap: use a common implement for set_tracked
Closed	marmoute	D11573 dirstatemap: add a common `_insert_entry` method for dirstatemap
Closed	marmoute	D11572 dirstatemap: use a common implementation for `dirstatemap.set_untracked`
Closed	marmoute	D11571 dirstatemap: add a common `_refresh_entry` method for dirstatemap
Closed	marmoute	D11570 dirstatemap: create `_dirs_incr/_dirs_decr` methods on the common class
Closed	marmoute	D11569 dirstatemap: small rework of the `set_untracked` method
Closed	marmoute	D11568 dirstatemap: arrange methods by category
Closed	marmoute	D11567 dirstatemap: move a multiple simple functions in the common class
Closed	marmoute	D11566 dirstatemap: rename `_rustmap` to `_map`
Closed	marmoute	D11565 dirstatemap: use a common __init__ for dirstatemap
Closed	marmoute	D11564 dirstatemap: introduce a common base for the dirstatemap class

Diff 30575

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

This is an archive of the discontinued Mercurial Phabricator instance.

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

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30575

mercurial/cext/parsers.c

mercurial/pure/parsers.py

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

Revision Contents
Changeset List