This is an archive of the discontinued Mercurial Phabricator instance.

Differential D2177

bdiff: add to clang-format oversight
ClosedPublic

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

Details

Reviewers
indygreg
Group Reviewers
hg-reviewers
Commits
rHGb4fdc6177b29: bdiff: add to clang-format oversight
Summary

This file didn't require any complex fixes, so we may as well enable
clang-format while I'm editing it.

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

durin42 created this revision.Feb 12 2018, 10:23 AM
indygreg accepted this revision.Feb 12 2018, 2:02 PM
This revision is now accepted and ready to land.Feb 12 2018, 2:02 PM
Closed by commit rHGb4fdc6177b29: bdiff: add to clang-format oversight (authored by durin42). · Explain WhyFeb 12 2018, 2:04 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

Diff 5494

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/base85.c mercurial/cext/base85.c
mercurial/cext/bdiff.c
mercurial/cext/charencode.c mercurial/cext/charencode.c
mercurial/cext/charencode.h mercurial/cext/charencode.h
mercurial/cext/diffhelpers.c mercurial/cext/diffhelpers.c
mercurial/cext/dirs.c mercurial/cext/dirs.c
mercurial/cext/manifest.c mercurial/cext/manifest.c
mercurial/cext/mpatch.c mercurial/cext/mpatch.c
mercurial/cext/osutil.c mercurial/cext/osutil.c
mercurial/cext/pathencode.c mercurial/cext/pathencode.c

mercurial/cext/bdiff.c

#include <limits.h> #include <limits.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "bdiff.h" #include "bdiff.h"
#include "bitmanipulation.h" #include "bitmanipulation.h"
#include "util.h" #include "util.h"
static PyObject *blocks(PyObject *self, PyObject *args) static PyObject *blocks(PyObject *self, PyObject *args)
{ {
PyObject *sa, *sb, *rl = NULL, *m; PyObject *sa, *sb, *rl = NULL, *m;
struct bdiff_line *a, *b; struct bdiff_line *a, *b;
struct bdiff_hunk l, *h; struct bdiff_hunk l, *h;
int an, bn, count, pos = 0; int an, bn, count, pos = 0;
l.next = NULL; l.next = NULL;
if (la > UINT_MAX || lb > UINT_MAX) { if (la > UINT_MAX || lb > UINT_MAX) {
PyErr_SetString(PyExc_ValueError, "bdiff inputs too large"); PyErr_SetString(PyExc_ValueError, "bdiff inputs too large");
return NULL; return NULL;
} }
_save = PyEval_SaveThread(); _save = PyEval_SaveThread();
lmax = la > lb ? lb : la; lmax = la > lb ? lb : la;
for (ia = sa, ib = sb; for (ia = sa, ib = sb; li < lmax && *ia == *ib; ++li, ++ia, ++ib)
li < lmax && *ia == *ib;
++li, ++ia, ++ib)
if (*ia == '\n') if (*ia == '\n')
lcommon = li + 1; lcommon = li + 1;
/* we can almost add: if (li == lmax) lcommon = li; */ /* we can almost add: if (li == lmax) lcommon = li; */
an = bdiff_splitlines(sa + lcommon, la - lcommon, &al); an = bdiff_splitlines(sa + lcommon, la - lcommon, &al);
bn = bdiff_splitlines(sb + lcommon, lb - lcommon, &bl); bn = bdiff_splitlines(sb + lcommon, lb - lcommon, &bl);
if (!al || !bl) if (!al || !bl)
goto nomem; goto nomem;
/* build binary patch */ /* build binary patch */
rb = PyBytes_AsString(result); rb = PyBytes_AsString(result);
la = lb = 0; la = lb = 0;
for (h = l.next; h; h = h->next) { for (h = l.next; h; h = h->next) {
if (h->a1 != la || h->b1 != lb) { if (h->a1 != la || h->b1 != lb) {
len = bl[h->b1].l - bl[lb].l; len = bl[h->b1].l - bl[lb].l;
putbe32((uint32_t)(al[la].l + lcommon - al->l), rb); putbe32((uint32_t)(al[la].l + lcommon - al->l), rb);
putbe32((uint32_t)(al[h->a1].l + lcommon - al->l), rb + 4); putbe32((uint32_t)(al[h->a1].l + lcommon - al->l),
rb + 4);
putbe32((uint32_t)len, rb + 8); putbe32((uint32_t)len, rb + 8);
memcpy(rb + 12, bl[lb].l, len); memcpy(rb + 12, bl[lb].l, len);
rb += 12 + len; rb += 12 + len;
} }
la = h->a2; la = h->a2;
lb = h->b2; lb = h->b2;
} }
if (!w) if (!w)
goto nomem; goto nomem;
for (i = 0; i != rlen; i++) { for (i = 0; i != rlen; i++) {
c = r[i]; c = r[i];
if (c == ' ' || c == '\t' || c == '\r') { if (c == ' ' || c == '\t' || c == '\r') {
if (!allws && (wlen == 0 || w[wlen - 1] != ' ')) if (!allws && (wlen == 0 || w[wlen - 1] != ' '))
w[wlen++] = ' '; w[wlen++] = ' ';
} else if (c == '\n' && !allws } else if (c == '\n' && !allws && wlen > 0 &&
&& wlen > 0 && w[wlen - 1] == ' ') { w[wlen - 1] == ' ') {
w[wlen - 1] = '\n'; w[wlen - 1] = '\n';
} else { } else {
w[wlen++] = c; w[wlen++] = c;
} }
} }
result = PyBytes_FromStringAndSize(w, wlen); result = PyBytes_FromStringAndSize(w, wlen);
nomem: nomem:
PyMem_Free(w); PyMem_Free(w);
return result ? result : PyErr_NoMemory(); return result ? result : PyErr_NoMemory();
} }
static char mdiff_doc[] = "Efficient binary diff."; static char mdiff_doc[] = "Efficient binary diff.";
static PyMethodDef methods[] = { static PyMethodDef methods[] = {
{"bdiff", bdiff, METH_VARARGS, "calculate a binary diff\n"}, {"bdiff", bdiff, METH_VARARGS, "calculate a binary diff\n"},
{"blocks", blocks, METH_VARARGS, "find a list of matching lines\n"}, {"blocks", blocks, METH_VARARGS, "find a list of matching lines\n"},
{"fixws", fixws, METH_VARARGS, "normalize diff whitespaces\n"}, {"fixws", fixws, METH_VARARGS, "normalize diff whitespaces\n"},
{NULL, NULL} {NULL, NULL},
}; };
static const int version = 1; static const int version = 1;
#ifdef IS_PY3K #ifdef IS_PY3K
static struct PyModuleDef bdiff_module = { static struct PyModuleDef bdiff_module = {
PyModuleDef_HEAD_INIT, PyModuleDef_HEAD_INIT, "bdiff", mdiff_doc, -1, methods,
"bdiff",
mdiff_doc,
-1,
methods
}; };
PyMODINIT_FUNC PyInit_bdiff(void) PyMODINIT_FUNC PyInit_bdiff(void)
{ {
PyObject *m; PyObject *m;
m = PyModule_Create(&bdiff_module); m = PyModule_Create(&bdiff_module);
PyModule_AddIntConstant(m, "version", version); PyModule_AddIntConstant(m, "version", version);
return m; return m;