marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY Nobody is calling it anymore. Its purposes has been filled. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D11603 AFFECTED FILES mercurial/cext/parsers.c mercurial/pure/parsers.py rust/hg-core/src/dirstate/entry.rs rust/hg-cpython/src/dirstate/item.rs CHANGE DETAILS diff --git a/rust/hg-cpython/src/dirstate/item.rs b/rust/hg-cpython/src/dirstate/item.rs --- a/rust/hg-cpython/src/dirstate/item.rs +++ b/rust/hg-cpython/src/dirstate/item.rs @@ -139,12 +139,6 @@ } @classmethod - def new_from_p2(_cls) -> PyResult<Self> { - let entry = DirstateEntry::new_from_p2(); - DirstateItem::create_instance(py, Cell::new(entry)) - } - - @classmethod def new_possibly_dirty(_cls) -> PyResult<Self> { let entry = DirstateEntry::new_possibly_dirty(); DirstateItem::create_instance(py, Cell::new(entry)) diff --git a/rust/hg-core/src/dirstate/entry.rs b/rust/hg-core/src/dirstate/entry.rs --- a/rust/hg-core/src/dirstate/entry.rs +++ b/rust/hg-core/src/dirstate/entry.rs @@ -113,15 +113,6 @@ } } - pub fn new_from_p2() -> Self { - Self { - // might be missing P1_TRACKED - flags: Flags::WDIR_TRACKED | Flags::P2_INFO, - mode_size: None, - mtime: None, - } - } - pub fn new_possibly_dirty() -> Self { Self { flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED, diff --git a/mercurial/pure/parsers.py b/mercurial/pure/parsers.py --- a/mercurial/pure/parsers.py +++ b/mercurial/pure/parsers.py @@ -109,14 +109,6 @@ self._mtime = parentfiledata[2] @classmethod - def new_from_p2(cls): - """constructor to help legacy API to build a new "from_p2" item - - Should eventually be removed - """ - return cls(wc_tracked=True, p2_info=True) - - @classmethod def new_possibly_dirty(cls): """constructor to help legacy API to build a new "possibly_dirty" item diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c --- a/mercurial/cext/parsers.c +++ b/mercurial/cext/parsers.c @@ -347,25 +347,6 @@ return (PyObject *)dirstate_item_from_v1_data(state, mode, size, mtime); }; -/* constructor to help legacy API to build a new "from_p2" item - -Should eventually be removed */ -static PyObject *dirstate_item_new_from_p2(PyTypeObject *subtype) -{ - /* We do all the initialization here and not a tp_init function because - * dirstate_item is immutable. */ - dirstateItemObject *t; - t = (dirstateItemObject *)subtype->tp_alloc(subtype, 1); - if (!t) { - return NULL; - } - t->flags = dirstate_flag_wc_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 "possibly" item Should eventually be removed */ @@ -475,9 +456,6 @@ "True if the stored mtime would be ambiguous with the current time"}, {"from_v1_data", (PyCFunction)dirstate_item_from_v1_meth, METH_VARARGS | METH_CLASS, "build a new DirstateItem object from V1 data"}, - {"new_from_p2", (PyCFunction)dirstate_item_new_from_p2, - METH_NOARGS | METH_CLASS, - "constructor to help legacy API to build a new \"from_p2\" item"}, {"new_possibly_dirty", (PyCFunction)dirstate_item_new_possibly_dirty, METH_NOARGS | METH_CLASS, "constructor to help legacy API to build a new \"possibly_dirty\" item"}, To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
