Patchwork D11599: dirstate-item: drop the legacy new_merged constructor

login
register
mail settings
Submitter phabricator
Date Oct. 3, 2021, 10:53 a.m.
Message ID <differential-rev-PHID-DREV-xrqwwoofvkfybfxswbd6-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/49924/
State Superseded
Headers show

Comments

phabricator - Oct. 3, 2021, 10:53 a.m.
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/D11599

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




To: marmoute, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

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
@@ -145,12 +145,6 @@ 
     }
 
     @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> {
         let entry = DirstateEntry::new_from_p2();
         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
@@ -129,16 +129,6 @@ 
         }
     }
 
-    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 {
         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
@@ -117,14 +117,6 @@ 
         return cls(wc_tracked=True)
 
     @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):
         """constructor to help legacy API to build a new "from_p2" item
 
diff --git a/mercurial/cext/parsers.c b/mercurial/cext/parsers.c
--- a/mercurial/cext/parsers.c
+++ b/mercurial/cext/parsers.c
@@ -364,24 +364,6 @@ 
 	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
 
 Should eventually be removed */
@@ -513,9 +495,6 @@ 
     {"new_added", (PyCFunction)dirstate_item_new_added,
      METH_NOARGS | METH_CLASS,
      "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,
      METH_NOARGS | METH_CLASS,
      "constructor to help legacy API to build a new \"from_p2\" item"},