This is an archive of the discontinued Mercurial Phabricator instance.

Differential D907

cext: move braces for control statements to same line
ClosedPublic

Authored by indygreg on Oct 2 2017, 2:31 PM.

Details

Reviewers
quark
Group Reviewers
hg-reviewers
Commits
rHGce26a13869fb: cext: move braces for control statements to same line
Summary

This seems to be the prevailing style in the code by a wide margin.

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

indygreg created this revision.Oct 2 2017, 2:31 PM
indygreg added a comment.Oct 2 2017, 2:33 PM

FWIW, this series stemmed from me hacking on a .clang-format file. I want the big patch where we run clang-format on the repo to be as simple as possible. This series (so far) is all about introducing consistency in our C code.

quark accepted this revision.Oct 2 2017, 2:54 PM
Closed by commit rHGce26a13869fb: cext: move braces for control statements to same line (authored by indygreg). · Explain WhyOct 3 2017, 5:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/cext/base85.c (12 lines)
Mmercurial/cext/revlog.c (3 lines)

Diff 2387

mercurial/cext/base85.c

if (i) if (i)
olen += i - 1; olen += i - 1;
if (!(out = PyBytes_FromStringAndSize(NULL, olen))) if (!(out = PyBytes_FromStringAndSize(NULL, olen)))
return NULL; return NULL;
dst = PyBytes_AsString(out); dst = PyBytes_AsString(out);
i = 0; i = 0;
while (i < len) while (i < len) {
{
acc = 0; acc = 0;
cap = len - i - 1; cap = len - i - 1;
if (cap > 4) if (cap > 4)
cap = 4; cap = 4;
for (j = 0; j < cap; i++, j++) for (j = 0; j < cap; i++, j++) {
{
c = b85dec[(int)*text++] - 1; c = b85dec[(int)*text++] - 1;
if (c < 0) if (c < 0)
return PyErr_Format( return PyErr_Format(
PyExc_ValueError, PyExc_ValueError,
"bad base85 character at position %d", "bad base85 character at position %d",
(int)i); (int)i);
acc = acc * 85 + c; acc = acc * 85 + c;
} }
if (i++ < len) if (i++ < len) {
{
c = b85dec[(int)*text++] - 1; c = b85dec[(int)*text++] - 1;
if (c < 0) if (c < 0)
return PyErr_Format( return PyErr_Format(
PyExc_ValueError, PyExc_ValueError,
"bad base85 character at position %d", "bad base85 character at position %d",
(int)i); (int)i);
/* overflow detection: 0xffffffff == "|NsC0", /* overflow detection: 0xffffffff == "|NsC0",
* "|NsC" == 0x03030303 */ * "|NsC" == 0x03030303 */
if (acc > 0x03030303 || (acc *= 85) > 0xffffffff - c) if (acc > 0x03030303 || (acc *= 85) > 0xffffffff - c)
return PyErr_Format( return PyErr_Format(
PyExc_ValueError, PyExc_ValueError,
"bad base85 sequence at position %d", "bad base85 sequence at position %d",
(int)i); (int)i);
acc += c; acc += c;
} }
cap = olen < 4 ? olen : 4; cap = olen < 4 ? olen : 4;
olen -= cap; olen -= cap;
for (j = 0; j < 4 - cap; j++) for (j = 0; j < 4 - cap; j++)
acc *= 85; acc *= 85;
if (cap && cap < 4) if (cap && cap < 4)
acc += 0xffffff >> (cap - 1) * 8; acc += 0xffffff >> (cap - 1) * 8;
for (j = 0; j < cap; j++) for (j = 0; j < cap; j++) {
{
acc = (acc << 8) | (acc >> 24); acc = (acc << 8) | (acc >> 24);
*dst++ = acc; *dst++ = acc;
} }
} }
return out; return out;
} }

mercurial/cext/revlog.c

PyObject *iter_item = NULL; PyObject *iter_item = NULL;
Py_ssize_t min_idx = index_length(self) + 1; Py_ssize_t min_idx = index_length(self) + 1;
long iter_item_long; long iter_item_long;
if (PyList_GET_SIZE(list) != 0) { if (PyList_GET_SIZE(list) != 0) {
iter = PyObject_GetIter(list); iter = PyObject_GetIter(list);
if (iter == NULL) if (iter == NULL)
return -2; return -2;
while ((iter_item = PyIter_Next(iter))) while ((iter_item = PyIter_Next(iter))) {
{
iter_item_long = PyInt_AS_LONG(iter_item); iter_item_long = PyInt_AS_LONG(iter_item);
Py_DECREF(iter_item); Py_DECREF(iter_item);
if (iter_item_long < min_idx) if (iter_item_long < min_idx)
min_idx = iter_item_long; min_idx = iter_item_long;
phases[iter_item_long] = marker; phases[iter_item_long] = marker;
} }
Py_DECREF(iter); Py_DECREF(iter);
} }