Show More
@@ -615,29 +615,6 bail: | |||||
615 | } |
|
615 | } | |
616 |
|
616 | |||
617 | /* |
|
617 | /* | |
618 | * Build a set of non-normal entries from the dirstate dmap |
|
|||
619 | */ |
|
|||
620 | static PyObject *nonnormalentries(PyObject *self, PyObject *args) |
|
|||
621 | { |
|
|||
622 | PyObject *nonnset = NULL, *combined = NULL; |
|
|||
623 |
|
||||
624 | combined = nonnormalotherparententries(self, args); |
|
|||
625 | if (!combined) { |
|
|||
626 | return NULL; |
|
|||
627 | } |
|
|||
628 |
|
||||
629 | nonnset = PyTuple_GetItem(combined, 0); |
|
|||
630 | if (!nonnset) { |
|
|||
631 | Py_DECREF(combined); |
|
|||
632 | return NULL; |
|
|||
633 | } |
|
|||
634 |
|
||||
635 | Py_INCREF(nonnset); |
|
|||
636 | Py_DECREF(combined); |
|
|||
637 | return nonnset; |
|
|||
638 | } |
|
|||
639 |
|
||||
640 | /* |
|
|||
641 | * Efficiently pack a dirstate object into its on-disk format. |
|
618 | * Efficiently pack a dirstate object into its on-disk format. | |
642 | */ |
|
619 | */ | |
643 | static PyObject *pack_dirstate(PyObject *self, PyObject *args) |
|
620 | static PyObject *pack_dirstate(PyObject *self, PyObject *args) | |
@@ -2854,8 +2831,6 PyObject *lowerencode(PyObject *self, Py | |||||
2854 |
|
2831 | |||
2855 | static PyMethodDef methods[] = { |
|
2832 | static PyMethodDef methods[] = { | |
2856 | {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"}, |
|
2833 | {"pack_dirstate", pack_dirstate, METH_VARARGS, "pack a dirstate\n"}, | |
2857 | {"nonnormalentries", nonnormalentries, METH_VARARGS, |
|
|||
2858 | "create a set containing non-normal entries of given dirstate\n"}, |
|
|||
2859 | {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS, |
|
2834 | {"nonnormalotherparententries", nonnormalotherparententries, METH_VARARGS, | |
2860 | "create a set containing non-normal and other parent entries of given " |
|
2835 | "create a set containing non-normal and other parent entries of given " | |
2861 | "dirstate\n"}, |
|
2836 | "dirstate\n"}, |
General Comments 0
You need to be logged in to leave comments.
Login now