This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2183

mpatch: allow clang-format oversight
ClosedPublic

Authored by durin42 on Feb 12 2018, 10:44 AM.

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHG69080ee1fb0e: mpatch: allow clang-format oversight
rHG782eecbcbc75: mpatch: allow clang-format oversight
Summary

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Feb 12 2018, 10:44 AM
indygreg accepted this revision.Feb 12 2018, 2:21 PM
This revision is now accepted and ready to land.Feb 12 2018, 2:21 PM
durin42 updated this revision to Diff 5750.Feb 14 2018, 9:15 PM
Closed by commit rHG782eecbcbc75: mpatch: allow clang-format oversight (authored by durin42). · Explain WhyFeb 14 2018, 11:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5493

contrib/clang-format-blacklist

# Files that just need to be migrated to the formatter. # Files that just need to be migrated to the formatter.
# Do not add new files here! # Do not add new files here!
mercurial/cext/bdiff.c mercurial/cext/bdiff.c
mercurial/cext/dirs.c mercurial/cext/dirs.c
mercurial/cext/manifest.c mercurial/cext/manifest.c
mercurial/cext/mpatch.c
mercurial/cext/osutil.c mercurial/cext/osutil.c
mercurial/cext/revlog.c mercurial/cext/revlog.c
# Vendored code that we should never format: # Vendored code that we should never format:
contrib/python-zstandard/c-ext/bufferutil.c contrib/python-zstandard/c-ext/bufferutil.c
contrib/python-zstandard/c-ext/compressiondict.c contrib/python-zstandard/c-ext/compressiondict.c
contrib/python-zstandard/c-ext/compressionparams.c contrib/python-zstandard/c-ext/compressionparams.c
contrib/python-zstandard/c-ext/compressionwriter.c contrib/python-zstandard/c-ext/compressionwriter.c
contrib/python-zstandard/c-ext/compressobj.c contrib/python-zstandard/c-ext/compressobj.c

mercurial/cext/mpatch.c

struct mpatch_flist *cpygetitem(void *bins, ssize_t pos) struct mpatch_flist *cpygetitem(void *bins, ssize_t pos)
{ {
const char *buffer; const char *buffer;
struct mpatch_flist *res; struct mpatch_flist *res;
ssize_t blen; ssize_t blen;
int r; int r;
PyObject *tmp = PyList_GetItem((PyObject*)bins, pos); PyObject *tmp = PyList_GetItem((PyObject *)bins, pos);
if (!tmp) if (!tmp)
return NULL; return NULL;
if (PyObject_AsCharBuffer(tmp, &buffer, (Py_ssize_t*)&blen)) if (PyObject_AsCharBuffer(tmp, &buffer, (Py_ssize_t *)&blen))
return NULL; return NULL;
if ((r = mpatch_decode(buffer, blen, &res)) < 0) { if ((r = mpatch_decode(buffer, blen, &res)) < 0) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())
setpyerr(r); setpyerr(r);
return NULL; return NULL;
} }
return res; return res;
} }
static PyObject * static PyObject *patches(PyObject *self, PyObject *args)
patches(PyObject *self, PyObject *args)
{ {
PyObject *text, *bins, *result; PyObject *text, *bins, *result;
struct mpatch_flist *patch; struct mpatch_flist *patch;
const char *in; const char *in;
int r = 0; int r = 0;
char *out; char *out;
Py_ssize_t len, outlen, inlen; Py_ssize_t len, outlen, inlen;
cleanup: cleanup:
mpatch_lfree(patch); mpatch_lfree(patch);
if (!result && !PyErr_Occurred()) if (!result && !PyErr_Occurred())
setpyerr(r); setpyerr(r);
return result; return result;
} }
/* calculate size of a patched file directly */ /* calculate size of a patched file directly */
static PyObject * static PyObject *patchedsize(PyObject *self, PyObject *args)
patchedsize(PyObject *self, PyObject *args)
{ {
long orig, start, end, len, outlen = 0, last = 0, pos = 0; long orig, start, end, len, outlen = 0, last = 0, pos = 0;
Py_ssize_t patchlen; Py_ssize_t patchlen;
char *bin; char *bin;
if (!PyArg_ParseTuple(args, "ls#", &orig, &bin, &patchlen)) if (!PyArg_ParseTuple(args, "ls#", &orig, &bin, &patchlen))
return NULL; return NULL;
while (pos >= 0 && pos < patchlen) { while (pos >= 0 && pos < patchlen) {
start = getbe32(bin + pos); start = getbe32(bin + pos);
end = getbe32(bin + pos + 4); end = getbe32(bin + pos + 4);
len = getbe32(bin + pos + 8); len = getbe32(bin + pos + 8);
if (start > end) if (start > end)
break; /* sanity check */ break; /* sanity check */
pos += 12 + len; pos += 12 + len;
outlen += start - last; outlen += start - last;
last = end; last = end;
outlen += len; outlen += len;
} }
if (pos != patchlen) { if (pos != patchlen) {
if (!PyErr_Occurred()) if (!PyErr_Occurred())
PyErr_SetString(mpatch_Error, "patch cannot be decoded"); PyErr_SetString(mpatch_Error,
"patch cannot be decoded");
return NULL; return NULL;
} }
outlen += orig - last; outlen += orig - last;
return Py_BuildValue("l", outlen); return Py_BuildValue("l", outlen);
} }
static PyMethodDef methods[] = { static PyMethodDef methods[] = {
{"patches", patches, METH_VARARGS, "apply a series of patches\n"}, {"patches", patches, METH_VARARGS, "apply a series of patches\n"},
{"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"}, {"patchedsize", patchedsize, METH_VARARGS, "calculed patched size\n"},
{NULL, NULL} {NULL, NULL},
}; };
static const int version = 1; static const int version = 1;
#ifdef IS_PY3K #ifdef IS_PY3K
static struct PyModuleDef mpatch_module = { static struct PyModuleDef mpatch_module = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT, "mpatch", mpatch_doc, -1, methods,
"mpatch",
mpatch_doc,
-1,
methods
}; };
PyMODINIT_FUNC PyInit_mpatch(void) PyMODINIT_FUNC PyInit_mpatch(void)
{ {
PyObject *m; PyObject *m;
m = PyModule_Create(&mpatch_module); m = PyModule_Create(&mpatch_module);
if (m == NULL) if (m == NULL)
return NULL; return NULL;
mpatch_Error = PyErr_NewException("mercurial.cext.mpatch.mpatchError", mpatch_Error =
NULL, NULL); PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL);
Py_INCREF(mpatch_Error); Py_INCREF(mpatch_Error);
PyModule_AddObject(m, "mpatchError", mpatch_Error); PyModule_AddObject(m, "mpatchError", mpatch_Error);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;
} }
#else #else
PyMODINIT_FUNC PyMODINIT_FUNC initmpatch(void)
initmpatch(void)
{ {
PyObject *m; PyObject *m;
m = Py_InitModule3("mpatch", methods, mpatch_doc); m = Py_InitModule3("mpatch", methods, mpatch_doc);
mpatch_Error = PyErr_NewException("mercurial.cext.mpatch.mpatchError", mpatch_Error =
NULL, NULL); PyErr_NewException("mercurial.cext.mpatch.mpatchError", NULL, NULL);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
} }
#endif #endif