Rev 1380: Use python implementation of send to stream function. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.4

------------------------------------------------------------
revno: 1380
revision-id: jelmer at samba.org-20080627162804-xxfjk30jfb53ilvb
parent: jelmer at samba.org-20080627160900-h5ohd3s3ihgudvm0
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Fri 2008-06-27 18:28:04 +0200
message:
  Use python implementation of send to stream function.
modified:
  commit.py                      commit.py-20060607190346-qvq128wgfubhhgm2-1
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  tests/__init__.py              __init__.py-20060508151940-e9f4d914801a2535
=== modified file 'commit.py'
--- a/commit.py	2008-06-22 22:58:50 +0000
+++ b/commit.py	2008-06-27 16:28:04 +0000
@@ -28,12 +28,12 @@
 
 from bzrlib.plugins.svn import core, properties
 from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn.delta import send_stream
 from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, ERR_REPOS_DISABLED_FEATURE
 from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features, 
                  parse_svk_features, SVN_PROP_SVK_MERGE)
 from bzrlib.plugins.svn.logwalker import lazy_dict
 from bzrlib.plugins.svn.mapping import parse_revision_id
-from bzrlib.plugins.svn.ra import txdelta_send_stream
 from bzrlib.plugins.svn.repository import SvnRepositoryFormat, SvnRepository
 
 import urllib
@@ -194,7 +194,7 @@
         """
         assert file_editor is not None
         txdelta = file_editor.apply_textdelta()
-        digest = txdelta_send_stream(StringIO(contents), txdelta)
+        digest = send_stream(StringIO(contents), txdelta)
         if 'validate' in debug.debug_flags:
             from fetch import md5_strings
             assert digest == md5_strings(contents)

=== modified file 'ra.c'
--- a/ra.c	2008-06-27 16:08:43 +0000
+++ b/ra.c	2008-06-27 16:28:04 +0000
@@ -2099,30 +2099,8 @@
     return (PyObject *)auth;
 }
 
-static PyObject *txdelta_send_stream(PyObject *self, PyObject *args)
-{
-    unsigned char digest[16];
-    apr_pool_t *pool;
-	PyObject *stream;
-	TxDeltaWindowHandlerObject *py_txdelta;
-
-	if (!PyArg_ParseTuple(args, "OO", &stream, &py_txdelta))
-		return NULL;
-
-	pool = Pool(NULL);
-
-	if (pool == NULL)
-		return NULL;
-
-	RUN_SVN_WITH_POOL(pool, svn_txdelta_send_stream(new_py_stream(pool, stream), py_txdelta->txdelta_handler, py_txdelta->txdelta_baton, (unsigned char *)digest, pool));
-
-    apr_pool_destroy(pool);
-    return PyString_FromStringAndSize((char *)digest, 16);
-}
-
 static PyMethodDef ra_module_methods[] = {
 	{ "version", (PyCFunction)version, METH_NOARGS, NULL },
-	{ "txdelta_send_stream", txdelta_send_stream, METH_VARARGS, NULL },
 	{ "get_ssl_client_cert_pw_file_provider", (PyCFunction)get_ssl_client_cert_pw_file_provider, METH_NOARGS, NULL },
 	{ "get_ssl_client_cert_file_provider", (PyCFunction)get_ssl_client_cert_file_provider, METH_NOARGS, NULL },
 	{ "get_ssl_server_trust_file_provider", (PyCFunction)get_ssl_server_trust_file_provider, METH_NOARGS, NULL },

=== modified file 'tests/__init__.py'
--- a/tests/__init__.py	2008-06-27 02:06:49 +0000
+++ b/tests/__init__.py	2008-06-27 16:28:04 +0000
@@ -30,8 +30,9 @@
 from bzrlib.workingtree import WorkingTree
 
 from bzrlib.plugins.svn import properties, ra, repos
+from bzrlib.plugins.svn.delta import send_stream
 from bzrlib.plugins.svn.client import Client
-from bzrlib.plugins.svn.ra import Auth, RemoteAccess, txdelta_send_stream
+from bzrlib.plugins.svn.ra import Auth, RemoteAccess
 
 class TestFileEditor(object):
     def __init__(self, file):
@@ -45,7 +46,7 @@
         if contents is None:
             contents = osutils.rand_chars(100)
         txdelta = self.file.apply_textdelta()
-        txdelta_send_stream(StringIO(contents), txdelta)
+        send_stream(StringIO(contents), txdelta)
 
     def close(self):
         assert not self.is_closed