/*
- * Copyright © 2008 Jelmer Vernooij <jelmer@samba.org>
+ * Copyright © 2008 Jelmer Vernooij <jelmer@jelmer.uk>
* -*- coding: utf-8 -*-
*
* This program is free software; you can redistribute it and/or modify
*
* You should have received a copy of the GNU Lesser General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <stdbool.h>
#include <Python.h>
extern PyTypeObject FileSystem_Type;
extern PyTypeObject Stream_Type;
-typedef struct {
- PyObject_HEAD
- apr_pool_t *pool;
- svn_repos_t *repos;
+typedef struct {
+ PyObject_VAR_HEAD
+ apr_pool_t *pool;
+ svn_repos_t *repos;
} RepositoryObject;
static PyObject *repos_create(PyObject *self, PyObject *args)
{
char *path;
PyObject *config=Py_None, *fs_config=Py_None;
- svn_repos_t *repos;
- apr_pool_t *pool;
- apr_hash_t *hash_config, *hash_fs_config;
+ svn_repos_t *repos = NULL;
+ apr_pool_t *pool;
+ apr_hash_t *hash_config, *hash_fs_config;
RepositoryObject *ret;
if (!PyArg_ParseTuple(args, "s|OO:create", &path, &config, &fs_config))
if (pool == NULL)
return NULL;
hash_config = config_hash_from_object(config, pool);
- if (hash_config == NULL)
+ if (hash_config == NULL) {
+ apr_pool_destroy(pool);
return NULL;
- hash_fs_config = apr_hash_make(pool); /* FIXME */
+ }
+ hash_fs_config = apr_hash_make(pool); /* FIXME */
if (hash_fs_config == NULL) {
PyErr_SetString(PyExc_RuntimeError, "Unable to create fs config hash");
return NULL;
}
- RUN_SVN_WITH_POOL(pool, svn_repos_create(&repos,
- svn_path_canonicalize(path, pool), NULL, NULL,
- hash_config, hash_fs_config, pool));
+ RUN_SVN_WITH_POOL(pool, svn_repos_create(&repos,
+ svn_dirent_canonicalize(path, pool), NULL, NULL,
+ hash_config, hash_fs_config, pool));
ret = PyObject_New(RepositoryObject, &Repository_Type);
if (ret == NULL)
static PyObject *repos_init(PyTypeObject *type, PyObject *args, PyObject *kwargs)
{
- char *path;
+ const char *path;
char *kwnames[] = { "path", NULL };
svn_error_t *err;
RepositoryObject *ret;
return NULL;
ret->pool = Pool(NULL);
- if (ret->pool == NULL)
+ if (ret->pool == NULL) {
+ PyObject_DEL(ret);
return NULL;
+ }
Py_BEGIN_ALLOW_THREADS
- err = svn_repos_open(&ret->repos, svn_path_canonicalize(path, ret->pool),
+ err = svn_repos_open(&ret->repos, svn_dirent_canonicalize(path, ret->pool),
ret->pool);
Py_END_ALLOW_THREADS
}
typedef struct {
- PyObject_HEAD
+ PyObject_VAR_HEAD
apr_pool_t *pool;
svn_fs_root_t *root;
} FileSystemRootObject;
typedef struct {
- PyObject_HEAD
+ PyObject_VAR_HEAD
RepositoryObject *repos;
- apr_pool_t *pool;
svn_fs_t *fs;
} FileSystemObject;
ret->fs = fs;
ret->repos = reposobj;
- ret->pool = reposobj->pool;
Py_INCREF(reposobj);
return (PyObject *)ret;
if (temp_pool == NULL)
return NULL;
RUN_SVN_WITH_POOL(temp_pool, svn_fs_get_uuid(fsobj->fs, &uuid, temp_pool));
- ret = PyString_FromString(uuid);
+ ret = PyUnicode_FromString(uuid);
apr_pool_destroy(temp_pool);
return ret;
if (temp_pool == NULL)
return NULL;
RUN_SVN_WITH_POOL(temp_pool, svn_fs_youngest_rev(&rev, self->fs, temp_pool));
- ret = PyInt_FromLong(rev);
+ ret = py_from_svn_revnum(rev);
apr_pool_destroy(temp_pool);
return ret;
{
FileSystemObject *fsobj = (FileSystemObject *)self;
Py_DECREF(fsobj->repos);
- apr_pool_destroy(fsobj->pool);
PyObject_DEL(fsobj);
}
PyTypeObject FileSystem_Type = {
- PyObject_HEAD_INIT(NULL) 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"repos.FileSystem", /* const char *tp_name; For printing, in format "<module>.<name>" */
- sizeof(FileSystemObject),
+ sizeof(FileSystemObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
-
+
/* Methods to implement standard operations */
-
+
fs_dealloc, /* destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* cmpfunc tp_compare; */
NULL, /* reprfunc tp_repr; */
-
+
/* Method suites for standard classes */
-
+
NULL, /* PyNumberMethods *tp_as_number; */
NULL, /* PySequenceMethods *tp_as_sequence; */
NULL, /* PyMappingMethods *tp_as_mapping; */
-
+
/* More standard operations (here for binary compatibility) */
-
+
NULL, /* hashfunc tp_hash; */
NULL, /* ternaryfunc tp_call; */
NULL, /* reprfunc tp_str; */
NULL, /* getattrofunc tp_getattro; */
NULL, /* setattrofunc tp_setattro; */
-
+
/* Functions to access object as input/output buffer */
NULL, /* PyBufferProcs *tp_as_buffer; */
-
+
/* Flags to define presence of optional/expanded features */
0, /* long tp_flags; */
-
+
NULL, /* const char *tp_doc; Documentation string */
-
+
/* Assigned meaning in release 2.0 */
/* call function for all accessible objects */
NULL, /* traverseproc tp_traverse; */
-
+
/* delete references to contained objects */
NULL, /* inquiry tp_clear; */
-
+
/* Assigned meaning in release 2.1 */
/* rich comparisons */
NULL, /* richcmpfunc tp_richcompare; */
-
+
/* weak reference enabler */
0, /* Py_ssize_t tp_weaklistoffset; */
-
+
/* Added in release 2.2 */
/* Iterators */
NULL, /* getiterfunc tp_iter; */
NULL, /* iternextfunc tp_iternext; */
-
+
/* Attribute descriptor and subclassing stuff */
fs_methods, /* struct PyMethodDef *tp_methods; */
PyObject *dumpstream, *feedback_stream;
unsigned char use_pre_commit_hook = 0, use_post_commit_hook = 0;
char *kwnames[] = { "dumpstream", "feedback_stream", "uuid_action",
- "parent_dir", "use_pre_commit_hook",
+ "parent_dir", "use_pre_commit_hook",
"use_post_commit_hook", NULL };
int uuid_action;
apr_pool_t *temp_pool;
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_repos_load_fs2(reposobj->repos,
- new_py_stream(temp_pool, dumpstream),
+ RUN_SVN_WITH_POOL(temp_pool, svn_repos_load_fs2(reposobj->repos,
+ new_py_stream(temp_pool, dumpstream),
new_py_stream(temp_pool, feedback_stream),
- uuid_action, parent_dir, use_pre_commit_hook,
+ uuid_action, parent_dir, use_pre_commit_hook,
use_post_commit_hook, py_cancel_check, NULL,
temp_pool));
apr_pool_destroy(temp_pool);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_repos_hotcopy(src_path, dest_path, clean_logs, temp_pool));
+ RUN_SVN_WITH_POOL(temp_pool,
+ svn_repos_hotcopy(src_path, dest_path, clean_logs, temp_pool));
apr_pool_destroy(temp_pool);
static PyObject *version(PyObject *self)
{
const svn_version_t *ver = svn_repos_version();
- return Py_BuildValue("(iiis)", ver->major, ver->minor,
+ return Py_BuildValue("(iiis)", ver->major, ver->minor,
ver->patch, ver->tag);
}
static PyObject *api_version(PyObject *self)
{
const svn_version_t *ver = &svn_api_version;
- return Py_BuildValue("(iiis)", ver->major, ver->minor,
+ return Py_BuildValue("(iiis)", ver->major, ver->minor,
ver->patch, ver->tag);
}
static PyMethodDef repos_module_methods[] = {
- { "create", (PyCFunction)repos_create, METH_VARARGS,
+ { "create", (PyCFunction)repos_create, METH_VARARGS,
"create(path, config=None, fs_config=None)\n\n"
"Create a new repository." },
- { "delete", (PyCFunction)repos_delete, METH_VARARGS,
+ { "delete", (PyCFunction)repos_delete, METH_VARARGS,
"delete(path)\n\n"
"Delete a repository." },
- { "hotcopy", (PyCFunction)repos_hotcopy, METH_VARARGS,
+ { "hotcopy", (PyCFunction)repos_hotcopy, METH_VARARGS,
"hotcopy(src_path, dest_path, clean_logs=False)\n\n"
"Make a hot copy of a repository." },
{ "api_version", (PyCFunction)api_version, METH_NOARGS,
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_repos_has_capability(self->repos, &has, name, temp_pool));
+ RUN_SVN_WITH_POOL(temp_pool,
+ svn_repos_has_capability(self->repos, &has, name, temp_pool));
apr_pool_destroy(temp_pool);
return PyBool_FromLong(has);
#else
#endif
}
+static PyObject *repos_verify(RepositoryObject *self, PyObject *args)
+{
+ apr_pool_t *temp_pool;
+ PyObject *py_feedback_stream;
+ svn_revnum_t start_rev, end_rev;
+ svn_stream_t *stream;
+ if (!PyArg_ParseTuple(args, "Oll", &py_feedback_stream, &start_rev, &end_rev))
+ return NULL;
+ temp_pool = Pool(NULL);
+ if (temp_pool == NULL) {
+ return NULL;
+ }
+ stream = new_py_stream(temp_pool, py_feedback_stream);
+ if (stream == NULL) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
+ RUN_SVN_WITH_POOL(temp_pool,
+ svn_repos_verify_fs(self->repos,
+ stream, start_rev, end_rev,
+ py_cancel_check, NULL, temp_pool));
+ apr_pool_destroy(temp_pool);
+
+ Py_RETURN_NONE;
+}
+
+static svn_error_t *py_pack_notify(void *baton, apr_int64_t shard, svn_fs_pack_notify_action_t action, apr_pool_t *pool)
+{
+ PyObject *ret;
+ if (baton == Py_None)
+ return NULL;
+ ret = PyObject_CallFunction((PyObject *)baton, "li", shard, action);
+ if (ret == NULL)
+ return py_svn_error();
+ Py_DECREF(ret);
+ return NULL;
+}
+
+static PyObject *repos_pack(RepositoryObject *self, PyObject *args)
+{
+ apr_pool_t *temp_pool;
+ PyObject *notify_func = Py_None;
+ if (!PyArg_ParseTuple(args, "|O", ¬ify_func))
+ return NULL;
+ temp_pool = Pool(NULL);
+ if (temp_pool == NULL)
+ return NULL;
+ RUN_SVN_WITH_POOL(temp_pool,
+ svn_repos_fs_pack(self->repos, py_pack_notify, notify_func,
+ py_cancel_check, NULL, temp_pool));
+ apr_pool_destroy(temp_pool);
+
+ Py_RETURN_NONE;
+}
+
static PyMethodDef repos_methods[] = {
{ "load_fs", (PyCFunction)repos_load_fs, METH_VARARGS|METH_KEYWORDS, NULL },
{ "fs", (PyCFunction)repos_fs, METH_NOARGS, NULL },
{ "has_capability", (PyCFunction)repos_has_capability, METH_VARARGS, NULL },
+ { "verify_fs", (PyCFunction)repos_verify, METH_VARARGS,
+ "S.verify_repos(feedback_stream, start_revnum, end_revnum)" },
+ { "pack_fs", (PyCFunction)repos_pack, METH_VARARGS, NULL },
{ NULL, }
};
PyTypeObject Repository_Type = {
- PyObject_HEAD_INIT(NULL) 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"repos.Repository", /* const char *tp_name; For printing, in format "<module>.<name>" */
- sizeof(RepositoryObject),
+ sizeof(RepositoryObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
-
+
/* Methods to implement standard operations */
-
+
repos_dealloc, /* destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* cmpfunc tp_compare; */
NULL, /* reprfunc tp_repr; */
-
+
/* Method suites for standard classes */
-
+
NULL, /* PyNumberMethods *tp_as_number; */
NULL, /* PySequenceMethods *tp_as_sequence; */
NULL, /* PyMappingMethods *tp_as_mapping; */
-
+
/* More standard operations (here for binary compatibility) */
-
+
NULL, /* hashfunc tp_hash; */
NULL, /* ternaryfunc tp_call; */
NULL, /* reprfunc tp_str; */
NULL, /* getattrofunc tp_getattro; */
NULL, /* setattrofunc tp_setattro; */
-
+
/* Functions to access object as input/output buffer */
NULL, /* PyBufferProcs *tp_as_buffer; */
-
+
/* Flags to define presence of optional/expanded features */
0, /* long tp_flags; */
-
+
"Local repository", /* const char *tp_doc; Documentation string */
-
+
/* Assigned meaning in release 2.0 */
/* call function for all accessible objects */
NULL, /* traverseproc tp_traverse; */
-
+
/* delete references to contained objects */
NULL, /* inquiry tp_clear; */
-
+
/* Assigned meaning in release 2.1 */
/* rich comparisons */
NULL, /* richcmpfunc tp_richcompare; */
-
+
/* weak reference enabler */
0, /* Py_ssize_t tp_weaklistoffset; */
-
+
/* Added in release 2.2 */
/* Iterators */
NULL, /* getiterfunc tp_iter; */
NULL, /* iternextfunc tp_iternext; */
-
+
/* Attribute descriptor and subclassing stuff */
repos_methods, /* struct PyMethodDef *tp_methods; */
NULL, /* struct PyMemberDef *tp_members; */
apr_pool_destroy(temp_pool);
return NULL;
}
- return PyString_FromStringAndSize(str->data, str->len);
+ return PyBytes_FromStringAndSize(str->data, str->len);
}
#if ONLY_BEFORE_SVN(1, 6)
if (temp_pool == NULL)
return NULL;
#if ONLY_SINCE_SVN(1, 6)
- RUN_SVN_WITH_POOL(temp_pool,
+ RUN_SVN_WITH_POOL(temp_pool,
svn_fs_paths_changed2(&changed_paths, self->root, temp_pool));
#else
- RUN_SVN_WITH_POOL(temp_pool,
+ RUN_SVN_WITH_POOL(temp_pool,
svn_fs_paths_changed(&changed_paths, self->root, temp_pool));
#endif
ret = PyDict_New();
+ if (ret == NULL) {
+ apr_pool_destroy(temp_pool);
+ return NULL;
+ }
+
for (idx = apr_hash_first(temp_pool, changed_paths); idx != NULL;
idx = apr_hash_next(idx)) {
PyObject *py_val;
PyObject_Del(ret);
return NULL;
}
- PyDict_SetItemString(ret, key, py_val);
+ if (PyDict_SetItemString(ret, key, py_val) != 0) {
+ apr_pool_destroy(temp_pool);
+ PyObject_Del(ret);
+ Py_DECREF(py_val);
+ return NULL;
+ }
+
Py_DECREF(py_val);
}
apr_pool_destroy(temp_pool);
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_is_dir(&is_dir, self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_is_dir(&is_dir, self->root,
path, temp_pool));
apr_pool_destroy(temp_pool);
return PyBool_FromLong(is_dir);
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_is_file(&is_file, self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_is_file(&is_file, self->root,
path, temp_pool));
apr_pool_destroy(temp_pool);
return PyBool_FromLong(is_file);
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_length(&filesize, self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_length(&filesize, self->root,
path, temp_pool));
apr_pool_destroy(temp_pool);
- return PyInt_FromLong(filesize);
+ return PyLong_FromLong(filesize);
}
static PyObject *fs_node_file_proplist(FileSystemRootObject *self, PyObject *args)
temp_pool = Pool(NULL);
if (temp_pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_node_proplist(&proplist, self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_node_proplist(&proplist, self->root,
path, temp_pool));
ret = prop_hash_to_dict(proplist);
apr_pool_destroy(temp_pool);
if (temp_pool == NULL)
return NULL;
#if ONLY_SINCE_SVN(1, 6)
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_checksum(&checksum, kind,
- self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_checksum(&checksum, kind,
+ self->root,
path, force, temp_pool));
cstr = svn_checksum_to_cstring(checksum, temp_pool);
if (cstr == NULL) {
ret = Py_None;
Py_INCREF(ret);
} else {
- ret = PyString_FromString(cstr);
+ ret = PyUnicode_FromString(cstr);
}
#else
if (kind > 0) {
return NULL;
}
- RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_md5_checksum(checksum,
- self->root,
+ RUN_SVN_WITH_POOL(temp_pool, svn_fs_file_md5_checksum(checksum,
+ self->root,
path, temp_pool));
- ret = PyString_FromStringAndSize((char *)checksum, APR_MD5_DIGESTSIZE);
+ ret = PyBytes_FromStringAndSize((char *)checksum, APR_MD5_DIGESTSIZE);
#endif
apr_pool_destroy(temp_pool);
return ret;
pool = Pool(NULL);
if (pool == NULL)
return NULL;
- RUN_SVN_WITH_POOL(pool, svn_fs_file_contents(&stream, self->root,
+ RUN_SVN_WITH_POOL(pool, svn_fs_file_contents(&stream, self->root,
path, pool));
ret = PyObject_New(StreamObject, &Stream_Type);
};
PyTypeObject FileSystemRoot_Type = {
- PyObject_HEAD_INIT(NULL) 0,
+ PyVarObject_HEAD_INIT(NULL, 0)
"repos.FileSystemRoot", /* const char *tp_name; For printing, in format "<module>.<name>" */
- sizeof(FileSystemRootObject),
+ sizeof(FileSystemRootObject),
0,/* Py_ssize_t tp_basicsize, tp_itemsize; For allocation */
-
+
/* Methods to implement standard operations */
-
+
fs_root_dealloc, /* destructor tp_dealloc; */
NULL, /* printfunc tp_print; */
NULL, /* getattrfunc tp_getattr; */
NULL, /* setattrfunc tp_setattr; */
NULL, /* cmpfunc tp_compare; */
NULL, /* reprfunc tp_repr; */
-
+
/* Method suites for standard classes */
-
+
NULL, /* PyNumberMethods *tp_as_number; */
NULL, /* PySequenceMethods *tp_as_sequence; */
NULL, /* PyMappingMethods *tp_as_mapping; */
-
+
/* More standard operations (here for binary compatibility) */
-
+
NULL, /* hashfunc tp_hash; */
NULL, /* ternaryfunc tp_call; */
NULL, /* reprfunc tp_str; */
NULL, /* getattrofunc tp_getattro; */
NULL, /* setattrofunc tp_setattro; */
-
+
/* Functions to access object as input/output buffer */
NULL, /* PyBufferProcs *tp_as_buffer; */
-
+
/* Flags to define presence of optional/expanded features */
0, /* long tp_flags; */
-
+
NULL, /* const char *tp_doc; Documentation string */
-
+
/* Assigned meaning in release 2.0 */
/* call function for all accessible objects */
NULL, /* traverseproc tp_traverse; */
-
+
/* delete references to contained objects */
NULL, /* inquiry tp_clear; */
-
+
/* Assigned meaning in release 2.1 */
/* rich comparisons */
NULL, /* richcmpfunc tp_richcompare; */
-
+
/* weak reference enabler */
0, /* Py_ssize_t tp_weaklistoffset; */
-
+
/* Added in release 2.2 */
/* Iterators */
NULL, /* getiterfunc tp_iter; */
NULL, /* iternextfunc tp_iternext; */
-
+
/* Attribute descriptor and subclassing stuff */
fs_root_methods, /* struct PyMethodDef *tp_methods; */
};
-void initrepos(void)
+static PyObject *moduleinit(void)
{
static apr_pool_t *pool;
PyObject *mod;
if (PyType_Ready(&Repository_Type) < 0)
- return;
+ return NULL;
if (PyType_Ready(&FileSystem_Type) < 0)
- return;
+ return NULL;
if (PyType_Ready(&FileSystemRoot_Type) < 0)
- return;
+ return NULL;
if (PyType_Ready(&Stream_Type) < 0)
- return;
+ return NULL;
apr_initialize();
pool = Pool(NULL);
if (pool == NULL)
- return;
+ return NULL;
svn_fs_initialize(pool);
+#if PY_MAJOR_VERSION >= 3
+ static struct PyModuleDef moduledef = {
+ PyModuleDef_HEAD_INIT,
+ "repos", /* m_name */
+ "Local repository management.", /* m_doc */
+ -1, /* m_size */
+ repos_module_methods, /* m_methods */
+ NULL, /* m_reload */
+ NULL, /* m_traverse */
+ NULL, /* m_clear*/
+ NULL, /* m_free */
+ };
+ mod = PyModule_Create(&moduledef);
+#else
mod = Py_InitModule3("repos", repos_module_methods, "Local repository management");
+#endif
if (mod == NULL)
- return;
+ return NULL;
- PyModule_AddObject(mod, "LOAD_UUID_DEFAULT", PyLong_FromLong(svn_repos_load_uuid_default));
- PyModule_AddObject(mod, "LOAD_UUID_IGNORE", PyLong_FromLong(svn_repos_load_uuid_ignore));
- PyModule_AddObject(mod, "LOAD_UUID_FORCE", PyLong_FromLong(svn_repos_load_uuid_force));
+ PyModule_AddIntConstant(mod, "LOAD_UUID_DEFAULT", svn_repos_load_uuid_default);
+ PyModule_AddIntConstant(mod, "LOAD_UUID_IGNORE", svn_repos_load_uuid_ignore);
+ PyModule_AddIntConstant(mod, "LOAD_UUID_FORCE", svn_repos_load_uuid_force);
- PyModule_AddObject(mod, "PATH_CHANGE_MODIFY", PyInt_FromLong(svn_fs_path_change_modify));
- PyModule_AddObject(mod, "PATH_CHANGE_ADD", PyInt_FromLong(svn_fs_path_change_add));
- PyModule_AddObject(mod, "PATH_CHANGE_DELETE", PyInt_FromLong(svn_fs_path_change_delete));
- PyModule_AddObject(mod, "PATH_CHANGE_REPLACE", PyInt_FromLong(svn_fs_path_change_replace));
+ PyModule_AddIntConstant(mod, "PATH_CHANGE_MODIFY", svn_fs_path_change_modify);
+ PyModule_AddIntConstant(mod, "PATH_CHANGE_ADD", svn_fs_path_change_add);
+ PyModule_AddIntConstant(mod, "PATH_CHANGE_DELETE", svn_fs_path_change_delete);
+ PyModule_AddIntConstant(mod, "PATH_CHANGE_REPLACE", svn_fs_path_change_replace);
#if ONLY_SINCE_SVN(1, 6)
- PyModule_AddObject(mod, "CHECKSUM_MD5", PyInt_FromLong(svn_checksum_md5));
- PyModule_AddObject(mod, "CHECKSUM_SHA1", PyInt_FromLong(svn_checksum_sha1));
+ PyModule_AddIntConstant(mod, "CHECKSUM_MD5", svn_checksum_md5);
+ PyModule_AddIntConstant(mod, "CHECKSUM_SHA1", svn_checksum_sha1);
#else
- PyModule_AddObject(mod, "CHECKSUM_MD5", PyInt_FromLong(0));
+ PyModule_AddIntConstant(mod, "CHECKSUM_MD5", 0);
#endif
PyModule_AddObject(mod, "Repository", (PyObject *)&Repository_Type);
PyModule_AddObject(mod, "Stream", (PyObject *)&Stream_Type);
Py_INCREF(&Stream_Type);
+
+ return mod;
}
+
+#if PY_MAJOR_VERSION >= 3
+PyMODINIT_FUNC
+PyInit_repos(void)
+{
+ return moduleinit();
+}
+#else
+PyMODINIT_FUNC
+initrepos(void)
+{
+ moduleinit();
+}
+#endif
git.samba.org / jelmer / subvertpy.git / blobdiff