Submitter | Augie Fackler |
---|---|
Date | March 10, 2017, 10 p.m. |
Message ID | <cef8a5be497c381bf9ac.1489183222@augie-macbookair2.roam.corp.google.com> |
Download | mbox | patch |
Permalink | /patch/19086/ |
State | Accepted |
Headers | show |
Comments
Thanks for catching this! On 3/10/17 2:00 PM, Augie Fackler wrote: > # HG changeset patch > # User Augie Fackler <augie@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"}, > _______________________________________________ > Mercurial-devel mailing list > Mercurial-devel@mercurial-scm.org > https://urldefense.proofpoint.com/v2/url?u=https-3A__www.mercurial-2Dscm.org_mailman_listinfo_mercurial-2Ddevel&d=DwIGaQ&c=5VD0RTtNlTh3ycd41b3MUw&r=nuarHzhP1wi1T9iURRCj1A&m=YoSPOaQCJLIxXU_uFIzv5DMsLDHCKaL3_d9Lrwgjsm8&s=RYiavdFaVGL0CwZhAuoHONVTIR3ZI8B1IC99elKMaIc&e= >
Patch
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"},