Rev 1048: Fix missing objects, stop removing c files on clean since they're manually written now. in file:///data/jelmer/bzr-svn/cext/

Jelmer Vernooij jelmer at samba.org
Mon Jun 2 18:47:59 BST 2008


At file:///data/jelmer/bzr-svn/cext/

------------------------------------------------------------
revno: 1048
revision-id: jelmer at samba.org-20080602174759-60ftadjyjha0lhj6
parent: jelmer at samba.org-20080602171243-cfyorph2jrpr8rwq
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Mon 2008-06-02 19:47:59 +0200
message:
  Fix missing objects, stop removing c files on clean since they're manually written now.
modified:
  Makefile                       makefile.other-20080311181537-5svhje3v1flh1n4f-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  wc.c                           wc.pyx-20080313142018-10l8l23vha2j9e6b-1
=== modified file 'Makefile'
--- a/Makefile	2008-05-30 02:38:27 +0000
+++ b/Makefile	2008-06-02 17:47:59 +0000
@@ -21,7 +21,7 @@
 
 clean::
 	$(SETUP) clean
-	rm -f *.c *.so
+	rm -f *.so
 
 TMP_PLUGINS_DIR = $(shell pwd)/.plugins
 

=== modified file 'ra.c'
--- a/ra.c	2008-06-02 15:05:55 +0000
+++ b/ra.c	2008-06-02 17:47:59 +0000
@@ -224,6 +224,12 @@
 	void *txdelta_baton;
 } TxDeltaWindowHandlerObject;
 
+PyTypeObject TxDeltaWindowHandler_Type = {
+	PyObject_HEAD_INIT(NULL) 0,
+	.tp_name = "ra.TxDeltaWindowHandler",
+	.tp_call = NULL, /* FIXME */
+};
+
 static PyObject *py_file_editor_apply_textdelta(PyObject *self, PyObject *args)
 {
 	EditorObject *editor = (EditorObject *)self;
@@ -1184,8 +1190,12 @@
 		return NULL;
 	
 	temp_pool = Pool(ra->pool);
+#if SVN_VER_MAJOR >= 1 && SVN_VER_MINOR >= 5
 	RUN_SVN_WITH_POOL(temp_pool, 
 					  svn_ra_has_capability(ra->ra, &has, capability, temp_pool));
+#else
+	PyErr_SetNone(PyExc_NotImplementedError);
+#endif
 	apr_pool_destroy(temp_pool);
 	return PyBool_FromLong(has);
 }

=== modified file 'wc.c'
--- a/wc.c	2008-06-02 17:12:25 +0000
+++ b/wc.c	2008-06-02 17:47:59 +0000
@@ -129,6 +129,18 @@
 	svn_wc_entry_t *entry;
 } EntryObject;
 
+static void entry_dealloc(PyObject *self)
+{
+	apr_pool_destroy(((EntryObject *)self)->pool);
+}
+
+PyTypeObject Entry_Type = {
+	PyObject_HEAD_INIT(NULL) 0,
+	.tp_name = "wc.Entry",
+	.tp_basicsize = sizeof(EntryObject),
+	.tp_dealloc = entry_dealloc,
+};
+
 static PyObject *py_entry(const svn_wc_entry_t *entry)
 {
 	EntryObject *ret = PyObject_New(EntryObject, &Entry_Type);




More information about the bazaar-commits mailing list