Rev 1260: Move last py file to C. There are no dependencies on the upstream bindings anymore now. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4
Jelmer Vernooij
jelmer at samba.org
Sun Jun 22 09:08:40 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/0.4
------------------------------------------------------------
revno: 1260
revision-id: jelmer at samba.org-20080622080839-a7eguz5nac4njw9g
parent: jelmer at samba.org-20080622080044-rhp1ksghhe0rg9iv
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-22 10:08:39 +0200
message:
Move last py file to C. There are no dependencies on the upstream bindings anymore now.
removed:
core.py core.py-20080615010310-67lnibnp889hlarb-1
added:
core.c core.pyx-20080313210413-17k59slolpfe5kdq-1
modified:
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
setup.py setup.py-20060502115218-86950492da22353f
=== added file 'core.c'
--- a/core.c 1970-01-01 00:00:00 +0000
+++ b/core.c 2008-06-22 08:08:39 +0000
@@ -0,0 +1,142 @@
+/*
+ * Copyright © 2008 Jelmer Vernooij <jelmer at samba.org>
+ * -*- coding: utf-8 -*-
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+ */
+#include <stdbool.h>
+#include <Python.h>
+#include <apr_general.h>
+#include <string.h>
+#include <svn_time.h>
+#include <svn_config.h>
+#include <svn_io.h>
+#include <svn_utf.h>
+
+#include "util.h"
+
+/** Convert a UNIX timestamp to a Subversion CString. */
+static PyObject *time_to_cstring(PyObject *self, PyObject *args)
+{
+ PyObject *ret;
+ apr_pool_t *pool;
+ apr_time_t when;
+ if (!PyArg_ParseTuple(args, "L", &when))
+ return NULL;
+ pool = Pool(NULL);
+ if (pool == NULL)
+ return NULL;
+ ret = PyString_FromString(svn_time_to_cstring(when, pool));
+ apr_pool_destroy(pool);
+ return ret;
+}
+
+/** Parse a Subversion time string and return a UNIX timestamp. */
+static PyObject *time_from_cstring(PyObject *self, PyObject *args)
+{
+ apr_time_t when;
+ apr_pool_t *pool;
+ char *data;
+
+ if (!PyArg_ParseTuple(args, "s", &data))
+ return NULL;
+
+ pool = Pool(NULL);
+ if (pool == NULL)
+ return NULL;
+ RUN_SVN_WITH_POOL(pool, svn_time_from_cstring(&when, data, pool));
+ apr_pool_destroy(pool);
+ return PyLong_FromLongLong(when);
+}
+
+typedef struct {
+ PyObject_HEAD
+ svn_config_t *item;
+} ConfigObject;
+
+PyTypeObject Config_Type = {
+ PyObject_HEAD_INIT(NULL) 0,
+ .tp_name = "core.Config",
+ .tp_basicsize = sizeof(ConfigObject),
+ .tp_dealloc = (destructor)PyObject_Del,
+};
+
+static PyObject *get_config(PyObject *self, PyObject *args)
+{
+ apr_pool_t *pool;
+ apr_hash_t *cfg_hash = NULL;
+ apr_hash_index_t *idx;
+ const char *key;
+ svn_config_t *val;
+ apr_ssize_t klen;
+ char *config_dir = NULL;
+ PyObject *ret;
+
+ if (!PyArg_ParseTuple(args, "|z", &config_dir))
+ return NULL;
+
+ pool = Pool(NULL);
+ if (pool == NULL)
+ return NULL;
+
+ RUN_SVN_WITH_POOL(pool,
+ svn_config_get_config(&cfg_hash, config_dir, pool));
+ ret = PyDict_New();
+ for (idx = apr_hash_first(pool, cfg_hash); idx != NULL;
+ idx = apr_hash_next(idx)) {
+ ConfigObject *data;
+ apr_hash_this(idx, (const void **)&key, &klen, (void **)&val);
+ data = PyObject_New(ConfigObject, &Config_Type);
+ data->item = val;
+ PyDict_SetItemString(ret, key, (PyObject *)data);
+ }
+ apr_pool_destroy(pool);
+ return ret;
+}
+
+
+static PyMethodDef core_methods[] = {
+ { "get_config", get_config, METH_VARARGS, NULL },
+ { "time_from_cstring", time_from_cstring, METH_VARARGS, NULL },
+ { "time_to_cstring", time_to_cstring, METH_VARARGS, NULL },
+ { NULL, }
+};
+
+void initcore(void)
+{
+ static apr_pool_t *pool;
+ PyObject *mod;
+
+ if (PyType_Ready(&Config_Type) < 0)
+ return;
+
+ apr_initialize();
+ pool = Pool(NULL);
+ if (pool == NULL)
+ return;
+ svn_utf_initialize(pool);
+
+ mod = Py_InitModule3("core", core_methods, "Core functions");
+ if (mod == NULL)
+ return;
+
+ PyModule_AddIntConstant(mod, "NODE_DIR", svn_node_dir);
+ PyModule_AddIntConstant(mod, "NODE_FILE", svn_node_file);
+ PyModule_AddIntConstant(mod, "NODE_UNKNOWN", svn_node_unknown);
+ PyModule_AddIntConstant(mod, "NODE_NONE", svn_node_none);
+
+ PyModule_AddObject(mod, "SubversionException",
+ PyErr_NewException("core.SubversionException", NULL, NULL));
+}
=== removed file 'core.py'
--- a/core.py 2008-06-21 20:44:24 +0000
+++ b/core.py 1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-# Copyright (C) 2005-2007 Jelmer Vernooij <jelmer at samba.org>
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program. If not, see <http://www.gnu.org/licenses/>.
-
-import svn.core
-
-NODE_NONE = svn.core.svn_node_none
-NODE_FILE = svn.core.svn_node_file
-NODE_DIR = svn.core.svn_node_dir
-NODE_UNKNOWN = svn.core.svn_node_unknown
-
-SubversionException = svn.core.SubversionException
-time_to_cstring = svn.core.svn_time_to_cstring
-from bzrlib.plugins.svn.client import get_config
=== modified file 'mapping.py'
--- a/mapping.py 2008-06-06 17:19:53 +0000
+++ b/mapping.py 2008-06-22 08:08:39 +0000
@@ -19,7 +19,7 @@
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import version_info, errors, properties
+from bzrlib.plugins.svn import core, errors, properties, version_info
import calendar
import svn
import time
@@ -151,7 +151,7 @@
pass
if svn_revprops.has_key(properties.PROP_REVISION_DATE):
- rev.timestamp = 1.0 * svn.core.secs_from_timestr(svn_revprops[properties.PROP_REVISION_DATE], None)
+ rev.timestamp = core.time_from_cstring(svn_revprops[properties.PROP_REVISION_DATE]) / 1000000.0
else:
rev.timestamp = 0.0 # FIXME: Obtain repository creation time
rev.timezone = None
=== modified file 'setup.py'
--- a/setup.py 2008-06-22 07:44:40 +0000
+++ b/setup.py 2008-06-22 08:08:39 +0000
@@ -42,7 +42,9 @@
'bzrlib.plugins.svn.mapping3',
'bzrlib.plugins.svn.tests'],
ext_modules=[
- Extension("client", ["client.c", "util.c", "ra.c", "editor.c", "wc.c"], libraries=["svn_client-1"],
+ Extension("core", ["core.c", "util.c"], libraries=["svn_subr-1"],
+ include_dirs=[apr_include_dir(), svn_include_dir()]),
+ Extension("client", ["client.c", "util.c"], libraries=["svn_client-1"],
include_dirs=[apr_include_dir(), svn_include_dir()]),
Extension("ra", ["ra.c", "util.c", "editor.c"], libraries=["svn_ra-1"],
include_dirs=[apr_include_dir(), svn_include_dir()]),
More information about the bazaar-commits
mailing list