This is an archive of the discontinued Mercurial Phabricator instance.

			Path	Packages
M			mercurial/cext/parsers.c (21 lines)
M			mercurial/pure/parsers.py (8 lines)
M			rust/hg-core/src/dirstate/entry.rs (10 lines)
M			rust/hg-cpython/src/dirstate/item.rs (6 lines)

Status	Author	Revision
Abandoned	pulkit	D11588 dirstate: drop some duplicated code
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
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 30657

mercurial/cext/parsers.c

	}			}
	t->flags = dirstate_flag_wc_tracked;			t->flags = dirstate_flag_wc_tracked;
	t->mode = 0;			t->mode = 0;
	t->size = 0;			t->size = 0;
	t->mtime = 0;			t->mtime = 0;
	return (PyObject *)t;			return (PyObject *)t;
	};			};

	/* constructor to help legacy API to build a new "merged" item

	Should eventually be removed */
	static PyObject dirstate_item_new_merged(PyTypeObject subtype)
	{
	dirstateItemObject *t;
	t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1);
	if (!t) {
	return NULL;
	}
	t->flags = (dirstate_flag_wc_tracked \| dirstate_flag_p1_tracked \|
	dirstate_flag_p2_info);
	t->mode = 0;
	t->size = 0;
	t->mtime = 0;
	return (PyObject *)t;
	};

	/* constructor to help legacy API to build a new "from_p2" item			/* constructor to help legacy API to build a new "from_p2" item

	Should eventually be removed */			Should eventually be removed */
	static PyObject dirstate_item_new_from_p2(PyTypeObject subtype)			static PyObject dirstate_item_new_from_p2(PyTypeObject subtype)
	{			{
	/* We do all the initialization here and not a tp_init function because			/* We do all the initialization here and not a tp_init function because
	* dirstate_item is immutable. */			* dirstate_item is immutable. */
	dirstateItemObject *t;			dirstateItemObject *t;
	"return a \"mtime\" suitable for v1 serialization"},			"return a \"mtime\" suitable for v1 serialization"},
	{"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O,			{"need_delay", (PyCFunction)dirstate_item_need_delay, METH_O,
	"True if the stored mtime would be ambiguous with the current time"},			"True if the stored mtime would be ambiguous with the current time"},
	{"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth,			{"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth,
	METH_VARARGS \| METH_CLASS, "build a new DirstateItem object from V1 data"},			METH_VARARGS \| METH_CLASS, "build a new DirstateItem object from V1 data"},
	{"new_added", (PyCFunction)dirstate_item_new_added,			{"new_added", (PyCFunction)dirstate_item_new_added,
	METH_NOARGS \| METH_CLASS,			METH_NOARGS \| METH_CLASS,
	"constructor to help legacy API to build a new \"added\" item"},			"constructor to help legacy API to build a new \"added\" item"},
	{"new_merged", (PyCFunction)dirstate_item_new_merged,
	METH_NOARGS \| METH_CLASS,
	"constructor to help legacy API to build a new \"merged\" item"},
	{"new_from_p2", (PyCFunction)dirstate_item_new_from_p2,			{"new_from_p2", (PyCFunction)dirstate_item_new_from_p2,
	METH_NOARGS \| METH_CLASS,			METH_NOARGS \| METH_CLASS,
	"constructor to help legacy API to build a new \"from_p2\" item"},			"constructor to help legacy API to build a new \"from_p2\" item"},
	{"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty,			{"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty,
	METH_NOARGS \| METH_CLASS,			METH_NOARGS \| METH_CLASS,
	"constructor to help legacy API to build a new \"possibly_dirty\" item"},			"constructor to help legacy API to build a new \"possibly_dirty\" item"},
	{"new_normal", (PyCFunction)dirstate_item_new_normal,			{"new_normal", (PyCFunction)dirstate_item_new_normal,
	METH_VARARGS \| METH_CLASS,			METH_VARARGS \| METH_CLASS,

mercurial/pure/parsers.py

	def new_added(cls):			def new_added(cls):
	"""constructor to help legacy API to build a new "added" item			"""constructor to help legacy API to build a new "added" item

	Should eventually be removed			Should eventually be removed
	"""			"""
	return cls(wc_tracked=True)			return cls(wc_tracked=True)

	@classmethod			@classmethod
	def new_merged(cls):
	"""constructor to help legacy API to build a new "merged" item

	Should eventually be removed
	"""
	return cls(wc_tracked=True, p1_tracked=True, p2_info=True)

	@classmethod
	def new_from_p2(cls):			def new_from_p2(cls):
	"""constructor to help legacy API to build a new "from_p2" item			"""constructor to help legacy API to build a new "from_p2" item

	Should eventually be removed			Should eventually be removed
	"""			"""
	return cls(wc_tracked=True, p2_info=True)			return cls(wc_tracked=True, p2_info=True)

	@classmethod			@classmethod

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

	pub fn new_added() -> Self {			pub fn new_added() -> Self {
	Self {			Self {
	flags: Flags::WDIR_TRACKED,			flags: Flags::WDIR_TRACKED,
	mode_size: None,			mode_size: None,
	mtime: None,			mtime: None,
	}			}
	}			}

	pub fn new_merged() -> Self {
	Self {
	flags: Flags::WDIR_TRACKED
	\| Flags::P1_TRACKED // might not be true because of rename ?
	\| Flags::P2_INFO, // might not be true because of rename ?
	mode_size: None,
	mtime: None,
	}
	}

	pub fn new_normal(mode: i32, size: i32, mtime: i32) -> Self {			pub fn new_normal(mode: i32, size: i32, mtime: i32) -> Self {
	Self {			Self {
	flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,			flags: Flags::WDIR_TRACKED \| Flags::P1_TRACKED,
	mode_size: Some((mode, size)),			mode_size: Some((mode, size)),
	mtime: Some(mtime),			mtime: Some(mtime),
	}			}
	}			}

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


	@classmethod			@classmethod
	def new_added(_cls) -> PyResult<Self> {			def new_added(_cls) -> PyResult<Self> {
	let entry = DirstateEntry::new_added();			let entry = DirstateEntry::new_added();
	DirstateItem::create_instance(py, Cell::new(entry))			DirstateItem::create_instance(py, Cell::new(entry))
	}			}

	@classmethod			@classmethod
	def new_merged(_cls) -> PyResult<Self> {
	let entry = DirstateEntry::new_merged();
	DirstateItem::create_instance(py, Cell::new(entry))
	}

	@classmethod
	def new_from_p2(_cls) -> PyResult<Self> {			def new_from_p2(_cls) -> PyResult<Self> {
	let entry = DirstateEntry::new_from_p2();			let entry = DirstateEntry::new_from_p2();
	DirstateItem::create_instance(py, Cell::new(entry))			DirstateItem::create_instance(py, Cell::new(entry))
	}			}

	@classmethod			@classmethod
	def new_possibly_dirty(_cls) -> PyResult<Self> {			def new_possibly_dirty(_cls) -> PyResult<Self> {
	let entry = DirstateEntry::new_possibly_dirty();			let entry = DirstateEntry::new_possibly_dirty();

Diff	ID	Description	Created	Lint	Unit
Base		Base
Diff 1	30604		Oct 3 2021, 6:52 AM	★	★
Diff 2	30657	rHGb2af515b4faf83a8cf690586d64cfe5bbfebbb84	Oct 1 2021, 3:14 AM	★	★

This is an archive of the discontinued Mercurial Phabricator instance.

dirstate-item: drop the legacy new_merged constructorClosedPublic

Details

Diff Detail

Event Timeline

Revision ContentsChangeset List

Diff 30657

mercurial/cext/parsers.c

mercurial/pure/parsers.py

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

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

dirstate-item: drop the legacy new_merged constructor
ClosedPublic

Revision Contents
Changeset List