comparison mercurial/parsers.c @ 26055:607868eccaa7

reachableroots: return list of revisions instead of set

Now we don't need a set of reachable revisions, and the caller wants a sorted
list of revisions, so constructing a set is just a waste of time.

  revset #0: 0::tip
  2) 0.002536
  3) 0.001598  63%

PyList_New() should set an appropriate exception on error, so we don't need
to call PyErr_NoMemory() manually.

This patch lacks error handling of PyList_Append() as it was before for
PySet_Add(). It should be fixed later.

26054:5049e10fed14

	if (includepatharg == Py_True)
		includepath = 1;

	/* Initialize return set */
	reachable = PySet_New(NULL);
	if (reachable == NULL) {
		PyErr_NoMemory();
		goto bail;
	}

	/* Initialize internal datastructures */
	tovisit = (int *)malloc((len + 1) * sizeof(int));
	if (tovisit == NULL) {
		PyErr_NoMemory();

		if (revstates[revnum + 1] & RS_ROOT) {
			revstates[revnum + 1] |= RS_REACHABLE;
			val = PyInt_FromLong(revnum);
			if (val == NULL)
				goto bail;
			PySet_Add(reachable, val);
			Py_DECREF(val);
			if (includepath == 0)
				continue;
		}

			/* Corrupted index file, error is set from
			 * index_get_parents */
			if (r < 0)
				goto bail;
			for (k = 0; k < 2; k++) {
				if (revstates[parents[k] + 1] & RS_REACHABLE) {
					revstates[i + 1] |= RS_REACHABLE;
					val = PyInt_FromLong(i);
					if (val == NULL)
						goto bail;
					PySet_Add(reachable, val);
					Py_DECREF(val);
				}
			}
		}
	}

26055:607868eccaa7

	if (includepatharg == Py_True)
		includepath = 1;

	/* Initialize return set */
	reachable = PyList_New(0);
	if (reachable == NULL)
		goto bail;

	/* Initialize internal datastructures */
	tovisit = (int *)malloc((len + 1) * sizeof(int));
	if (tovisit == NULL) {
		PyErr_NoMemory();

		if (revstates[revnum + 1] & RS_ROOT) {
			revstates[revnum + 1] |= RS_REACHABLE;
			val = PyInt_FromLong(revnum);
			if (val == NULL)
				goto bail;
			PyList_Append(reachable, val);
			Py_DECREF(val);
			if (includepath == 0)
				continue;
		}

			/* Corrupted index file, error is set from
			 * index_get_parents */
			if (r < 0)
				goto bail;
			for (k = 0; k < 2; k++) {
				if ((revstates[parents[k] + 1] & RS_REACHABLE)
				    && !(revstates[i + 1] & RS_REACHABLE)) {
					revstates[i + 1] |= RS_REACHABLE;
					val = PyInt_FromLong(i);
					if (val == NULL)
						goto bail;
					PyList_Append(reachable, val);
					Py_DECREF(val);
				}
			}
		}
	}