This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8760

cext: remove unused variables
ClosedPublic

Authored by joerg.sonnenberger on Jul 16 2020, 1:49 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG9719e118e4af: cext: remove unused variables

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

martinvonz added a subscriber: martinvonz.Jul 16 2020, 1:53 PM
martinvonz added inline comments.
mercurial/cext/manifest.c
105–106

I'll remove this one too in flight.

joerg.sonnenberger added a commit: rHG9719e118e4af: cext: remove unused variables.Jul 16 2020, 1:59 PM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG9719e118e4af: cext: remove unused variables (authored by joerg.sonnenberger). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/manifest.c (3 lines)
Mmercurial/cext/revlog.c (5 lines)

Diff 21948

mercurial/cext/manifest.c

} }
return hash; return hash;
} }
/* get the node hash and flags of a line as a tuple */ /* get the node hash and flags of a line as a tuple */
static PyObject *hashflags(line *l) static PyObject *hashflags(line *l)
{ {
char flag; char flag;
PyObject *hash = nodeof(l, &flag); PyObject *hash = nodeof(l, &flag);
ssize_t hlen;
Py_ssize_t hplen, flen;
PyObject *flags; PyObject *flags;
martinvonzUnsubmitted
Not Done

I'll remove this one too in flight.

martinvonz: I'll remove this one too in flight.
PyObject *tup; PyObject *tup;
if (!hash) if (!hash)
return NULL; return NULL;
flags = PyBytes_FromStringAndSize(&flag, flag ? 1 : 0); flags = PyBytes_FromStringAndSize(&flag, flag ? 1 : 0);
if (!flags) { if (!flags) {
Py_DECREF(hash); Py_DECREF(hash);
return NULL; return NULL;
return self->m->lines + self->pos; return self->m->lines + self->pos;
} }
static PyObject *lmiter_iterentriesnext(PyObject *o) static PyObject *lmiter_iterentriesnext(PyObject *o)
{ {
Py_ssize_t pl; Py_ssize_t pl;
line *l; line *l;
char flag; char flag;
Py_ssize_t consumed;
PyObject *ret = NULL, *path = NULL, *hash = NULL, *flags = NULL; PyObject *ret = NULL, *path = NULL, *hash = NULL, *flags = NULL;
l = lmiter_nextline((lmIter *)o); l = lmiter_nextline((lmIter *)o);
if (!l) { if (!l) {
goto done; goto done;
} }
pl = pathlen(l); pl = pathlen(l);
path = PyBytes_FromStringAndSize(l->start, pl); path = PyBytes_FromStringAndSize(l->start, pl);
hash = nodeof(l, &flag); hash = nodeof(l, &flag);

mercurial/cext/revlog.c

free(tovisit); free(tovisit);
return NULL; return NULL;
} }
static int add_roots_get_min(indexObject *self, PyObject *roots, char *phases, static int add_roots_get_min(indexObject *self, PyObject *roots, char *phases,
char phase) char phase)
{ {
Py_ssize_t len = index_length(self); Py_ssize_t len = index_length(self);
PyObject *iter;
PyObject *item; PyObject *item;
PyObject *iterator; PyObject *iterator;
int rev, minrev = -1; int rev, minrev = -1;
char *node; char *node;
if (!PySet_Check(roots)) if (!PySet_Check(roots))
return -2; return -2;
iterator = PyObject_GetIter(roots); iterator = PyObject_GetIter(roots);
static PyObject *compute_phases_map_sets(indexObject *self, PyObject *args) static PyObject *compute_phases_map_sets(indexObject *self, PyObject *args)
{ {
/* 0: public (untracked), 1: draft, 2: secret, 32: archive, /* 0: public (untracked), 1: draft, 2: secret, 32: archive,
96: internal */ 96: internal */
static const char trackedphases[] = {1, 2, 32, 96}; static const char trackedphases[] = {1, 2, 32, 96};
PyObject *ret = NULL; PyObject *ret = NULL;
PyObject *roots = Py_None; PyObject *roots = Py_None;
PyObject *idx = NULL;
PyObject *pyphase = NULL; PyObject *pyphase = NULL;
PyObject *pyrev = NULL; PyObject *pyrev = NULL;
PyObject *phaseroots = NULL; PyObject *phaseroots = NULL;
PyObject *phasessize = NULL; PyObject *phasessize = NULL;
PyObject *phasesets[4] = {NULL, NULL, NULL, NULL}; PyObject *phasesets[4] = {NULL, NULL, NULL, NULL};
Py_ssize_t len = index_length(self); Py_ssize_t len = index_length(self);
const char *currentphase;
char *phases = NULL; char *phases = NULL;
int minphaserev = -1, rev, i; int minphaserev = -1, rev, i;
const int numphases = (int)(sizeof(phasesets) / sizeof(phasesets[0])); const int numphases = (int)(sizeof(phasesets) / sizeof(phasesets[0]));
if (!PyArg_ParseTuple(args, "O", &roots)) if (!PyArg_ParseTuple(args, "O", &roots))
return NULL; return NULL;
if (roots == NULL || !PyDict_Check(roots)) { if (roots == NULL || !PyDict_Check(roots)) {
PyErr_SetString(PyExc_TypeError, "roots must be a dictionary"); PyErr_SetString(PyExc_TypeError, "roots must be a dictionary");
Py_DECREF(pyrev); Py_DECREF(pyrev);
goto release; goto release;
} }
Py_DECREF(pyrev); Py_DECREF(pyrev);
} }
phaseroots = _dict_new_presized(numphases); phaseroots = _dict_new_presized(numphases);
if (phaseroots == NULL) if (phaseroots == NULL)
goto release; goto release;
for (int i = 0; i < numphases; ++i) { for (i = 0; i < numphases; ++i) {
pyphase = PyInt_FromLong(trackedphases[i]); pyphase = PyInt_FromLong(trackedphases[i]);
if (pyphase == NULL) if (pyphase == NULL)
goto release; goto release;
if (PyDict_SetItem(phaseroots, pyphase, phasesets[i]) == -1) { if (PyDict_SetItem(phaseroots, pyphase, phasesets[i]) == -1) {
Py_DECREF(pyphase); Py_DECREF(pyphase);
goto release; goto release;
} }
Py_DECREF(phasesets[i]); Py_DECREF(phasesets[i]);