[PATCH 2 of 2] parsers: drop old nonnormalentries method

Augie Fackler raf at durin42.com
Fri Mar 10 17:00:22 EST 2017


# HG changeset patch
# User Augie Fackler <augie at google.com>
# Date 1489182881 18000
#      Fri Mar 10 16:54:41 2017 -0500
# Node ID cef8a5be497c381bf9ac140977960910b491b8f6
# Parent  9fa4bea85bceac8c4851520a9fd9cfe604a53649
parsers: drop old nonnormalentries method

This is okay to do because the Python will fall back transparently if
the method is missing.

diff --git a/mercurial/parsers.c b/mercurial/parsers.c
--- a/mercurial/parsers.c
+++ b/mercurial/parsers.c
@@ -615,29 +615,6 @@ bail:
 }
 
 /*
- * Build a set of non-normal entries from the dirstate dmap
-*/
-static PyObject *nonnormalentries(PyObject *self, PyObject *args)
-{
-	PyObject *nonnset = NULL, *combined = NULL;
-
-	combined = nonnormalotherparententries(self, args);
-	if (!combined) {
-		return NULL;
-	}
-
-	nonnset = PyTuple_GetItem(combined, 0);
-	if (!nonnset) {
-		Py_DECREF(combined);
-		return NULL;
-	}
-
-	Py_INCREF(nonnset);
-	Py_DECREF(combined);
-	return nonnset;
-}
-
-/*
  * Efficiently pack a dirstate object into its on-disk format.
  */
 static PyObject *pack_dirstate(PyObject *self, PyObject *args)
@@ -2854,8 +2831,6 @@ PyObject *lowerencode(PyObject *self, Py
 
 static PyMethodDef methods[] = {
 	{"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"},
-	{"nonnormalentries", nonnormalentries, METH_VARARGS,
-	"create a set containing non-normal entries of given dirstate\n"},
 	{"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS,
 	"create a set containing non-normal and other parent entries of given "
 	"dirstate\n"},


More information about the Mercurial-devel mailing list