##// END OF EJS Templates
push: only push obsmarkers relevant to the "pushed subset"...
push: only push obsmarkers relevant to the "pushed subset" We should only exchange obsolete markers related to the changesets that are being exchanged. For example, if `A'` is a successor of `A`, we do not want to push the marker if we are not exchanging `A'`. Otherwise `A` would disappear without a successor, leading to confusion for both users and the evolution mechanism. Therefore we now exchange only the markers relevant to the subset of nodes involved in the push (the nodes themselves may be already common but were selected by --rev (or the lack of --rev)). Note that all selected markers are still exchanged on each push. We do not have a discovery protocol for markers in core yet. Such discovery would save us the exchange of markers known on both side.

File last commit:

r16848:19a915d4 default
r22350:6d113cc7 default
Show More
base85.c
185 lines | 3.4 KiB | text/x-c | CLexer
Brendan Cully
Add a base85 codec
r3283 /*
base85 codec
Copyright 2006 Brendan Cully <brendan@kublai.com>
This software may be used and distributed according to the terms of
the GNU General Public License, incorporated herein by reference.
Largely based on git's implementation
*/
Adrian Buehlmann
base85: use Py_ssize_t for string lengths
r16837 #define PY_SSIZE_T_CLEAN
Brendan Cully
Add a base85 codec
r3283 #include <Python.h>
Renato Cunha
base85.c: Added support for py3k....
r11362 #include "util.h"
Brendan Cully
Add a base85 codec
r3283 static const char b85chars[] = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ"
"abcdefghijklmnopqrstuvwxyz!#$%&()*+-;<=>?@^_`{|}~";
static char b85dec[256];
static void
b85prep(void)
{
int i;
memset(b85dec, 0, sizeof(b85dec));
for (i = 0; i < sizeof(b85chars); i++)
b85dec[(int)(b85chars[i])] = i + 1;
}
static PyObject *
b85encode(PyObject *self, PyObject *args)
{
const unsigned char *text;
PyObject *out;
char *dst;
Adrian Buehlmann
base85: use Py_ssize_t for string lengths
r16837 Py_ssize_t len, olen, i;
Brendan Cully
Add a base85 codec
r3283 unsigned int acc, val, ch;
Thomas Arendsen Hein
Some additional space/tab cleanups
r7190 int pad = 0;
Brendan Cully
Add a base85 codec
r3283
Alexis S. L. Carvalho
python2.5 PyArg_ParseTuple fix...
r3369 if (!PyArg_ParseTuple(args, "s#|i", &text, &len, &pad))
Brendan Cully
Add a base85 codec
r3283 return NULL;
Thomas Arendsen Hein
Some additional space/tab cleanups
r7190 if (pad)
olen = ((len + 3) / 4 * 5) - 3;
else {
olen = len % 4;
if (olen)
olen++;
olen += len / 4 * 5;
}
Renato Cunha
base85.c: Added support for py3k....
r11362 if (!(out = PyBytes_FromStringAndSize(NULL, olen + 3)))
Brendan Cully
Add a base85 codec
r3283 return NULL;
Renato Cunha
base85.c: Added support for py3k....
r11362 dst = PyBytes_AsString(out);
Brendan Cully
Add a base85 codec
r3283
Brendan Cully
Handle odd-sized base85 input and output
r3288 while (len) {
Brendan Cully
Add a base85 codec
r3283 acc = 0;
for (i = 24; i >= 0; i -= 8) {
ch = *text++;
acc |= ch << i;
if (--len == 0)
break;
}
for (i = 4; i >= 0; i--) {
val = acc % 85;
acc /= 85;
dst[i] = b85chars[val];
}
dst += 5;
}
Thomas Arendsen Hein
Some additional space/tab cleanups
r7190 if (!pad)
Renato Cunha
base85.c: Added support for py3k....
r11362 _PyBytes_Resize(&out, olen);
Brendan Cully
Handle odd-sized base85 input and output
r3288
Brendan Cully
Add a base85 codec
r3283 return out;
}
static PyObject *
b85decode(PyObject *self, PyObject *args)
{
PyObject *out;
const char *text;
char *dst;
Adrian Buehlmann
base85: use Py_ssize_t for string lengths
r16837 Py_ssize_t len, i, j, olen, cap;
int c;
Brendan Cully
Add a base85 codec
r3283 unsigned int acc;
Alexis S. L. Carvalho
python2.5 PyArg_ParseTuple fix...
r3369 if (!PyArg_ParseTuple(args, "s#", &text, &len))
Brendan Cully
Add a base85 codec
r3283 return NULL;
Brendan Cully
Handle odd-sized base85 input and output
r3288 olen = len / 5 * 4;
i = len % 5;
if (i)
olen += i - 1;
Renato Cunha
base85.c: Added support for py3k....
r11362 if (!(out = PyBytes_FromStringAndSize(NULL, olen)))
Brendan Cully
Add a base85 codec
r3283 return NULL;
Renato Cunha
base85.c: Added support for py3k....
r11362 dst = PyBytes_AsString(out);
Brendan Cully
Add a base85 codec
r3283
Brendan Cully
Handle odd-sized base85 input and output
r3288 i = 0;
while (i < len)
Brendan Cully
Add a base85 codec
r3283 {
acc = 0;
Brendan Cully
Handle odd-sized base85 input and output
r3288 cap = len - i - 1;
if (cap > 4)
cap = 4;
for (j = 0; j < cap; i++, j++)
Brendan Cully
Add a base85 codec
r3283 {
c = b85dec[(int)*text++] - 1;
if (c < 0)
Matt Mackall
many, many trivial check-code fixups
r10282 return PyErr_Format(
PyExc_ValueError,
Adrian Buehlmann
base85: cast Py_ssize_t values to int (issue3481)...
r16848 "bad base85 character at position %d",
(int)i);
Brendan Cully
Add a base85 codec
r3283 acc = acc * 85 + c;
}
Brendan Cully
Handle odd-sized base85 input and output
r3288 if (i++ < len)
Brendan Cully
Add a base85 codec
r3283 {
c = b85dec[(int)*text++] - 1;
if (c < 0)
Matt Mackall
many, many trivial check-code fixups
r10282 return PyErr_Format(
PyExc_ValueError,
Adrian Buehlmann
base85: cast Py_ssize_t values to int (issue3481)...
r16848 "bad base85 character at position %d",
(int)i);
Brendan Cully
Handle odd-sized base85 input and output
r3288 /* overflow detection: 0xffffffff == "|NsC0",
* "|NsC" == 0x03030303 */
if (acc > 0x03030303 || (acc *= 85) > 0xffffffff - c)
Matt Mackall
many, many trivial check-code fixups
r10282 return PyErr_Format(
PyExc_ValueError,
Adrian Buehlmann
base85: cast Py_ssize_t values to int (issue3481)...
r16848 "bad base85 sequence at position %d",
(int)i);
Brendan Cully
Handle odd-sized base85 input and output
r3288 acc += c;
Brendan Cully
Add a base85 codec
r3283 }
Brendan Cully
Handle odd-sized base85 input and output
r3288 cap = olen < 4 ? olen : 4;
olen -= cap;
for (j = 0; j < 4 - cap; j++)
acc *= 85;
if (cap && cap < 4)
acc += 0xffffff >> (cap - 1) * 8;
for (j = 0; j < cap; j++)
Brendan Cully
Add a base85 codec
r3283 {
acc = (acc << 8) | (acc >> 24);
Brendan Cully
Handle odd-sized base85 input and output
r3288 *dst++ = acc;
Brendan Cully
Add a base85 codec
r3283 }
}
return out;
}
static char base85_doc[] = "Base85 Data Encoding";
static PyMethodDef methods[] = {
Brendan Cully
Handle odd-sized base85 input and output
r3288 {"b85encode", b85encode, METH_VARARGS,
Thomas Arendsen Hein
Some additional space/tab cleanups
r7190 "Encode text in base85.\n\n"
"If the second parameter is true, pad the result to a multiple of "
"five characters.\n"},
Brendan Cully
Handle odd-sized base85 input and output
r3288 {"b85decode", b85decode, METH_VARARGS, "Decode base85 text.\n"},
Brendan Cully
Add a base85 codec
r3283 {NULL, NULL}
};
Renato Cunha
base85.c: Added support for py3k....
r11362 #ifdef IS_PY3K
static struct PyModuleDef base85_module = {
PyModuleDef_HEAD_INIT,
"base85",
base85_doc,
-1,
methods
};
PyMODINIT_FUNC PyInit_base85(void)
{
b85prep();
return PyModule_Create(&base85_module);
}
#else
Brendan Cully
Add a base85 codec
r3283 PyMODINIT_FUNC initbase85(void)
{
Py_InitModule3("base85", methods, base85_doc);
b85prep();
}
Renato Cunha
base85.c: Added support for py3k....
r11362 #endif