Rev 960: Fix reparent. in file:///data/jelmer/bzr-svn/pyrex/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 960
revision-id:jelmer at samba.org-20080313155602-8etettgfmn3oxhqb
parent: jelmer at samba.org-20080313155052-0jdmlnlau9saikqx
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Thu 2008-03-13 16:56:02 +0100
message:
  Fix reparent.
modified:
  ra.pyx                         ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
  transport.py                   transport.py-20060406231150-b3472d06b3a0818d
=== modified file 'ra.pyx'
--- a/ra.pyx	2008-03-13 15:50:52 +0000
+++ b/ra.pyx	2008-03-13 15:56:02 +0000
@@ -24,12 +24,18 @@
 cdef extern from "svn_error.h":
     ctypedef struct svn_error_t
 
+cdef extern from "svn_auth.h":
+    ctypedef struct svn_auth_baton_t
+
 cdef extern from "apr_errno.h":
     ctypedef int apr_status_t
 
 cdef extern from "apr_general.h":
     apr_status_t apr_initialize()
 
+cdef extern from "apr_file_io.h":
+    ctypedef struct apr_file_t 
+
 apr_initialize()
 
 cdef extern from "apr_pools.h":
@@ -78,7 +84,10 @@
 
         svn_error_t *(*abort_report)(void *report_baton, apr_pool_t *pool)
 
-    ctypedef struct svn_ra_callbacks2_t
+    ctypedef struct svn_ra_callbacks2_t:
+        svn_error_t *(*open_tmp_file)(apr_file_t **fp, 
+                                      void *callback_baton, apr_pool_t *pool)
+        svn_auth_baton_t *auth_baton
 
     svn_error_t *svn_ra_create_callbacks(svn_ra_callbacks2_t **callbacks,
                             apr_pool_t *pool)
@@ -155,11 +164,11 @@
         apr_pool_destroy(temp_pool)
         return uuid
 
-	def reparent(self, url):
-		"""Switch to a different url."""
+    def reparent(self, url):
+        """Switch to a different url."""
         cdef apr_pool_t *temp_pool
         temp_pool = Pool(self.pool)
-		_check_error(svn_ra_reparent(self.ra, url, temp_pool))
+        _check_error(svn_ra_reparent(self.ra, url, temp_pool))
         apr_pool_destroy(temp_pool)
 
     def get_latest_revnum(self):

=== modified file 'transport.py'
--- a/transport.py	2008-03-13 15:50:52 +0000
+++ b/transport.py	2008-03-13 15:56:02 +0000
@@ -404,7 +404,7 @@
             return
         if hasattr(svn.ra, 'reparent'):
             self.mutter('svn reparent %r' % url)
-            svn.ra.reparent(self._ra, self.svn_url, self.pool)
+            self.ra.reparent(self.svn_url, self.pool)
         else:
             self.mutter('svn reparent (reconnect) %r' % url)
             self._ra = svn.client.open_ra_session(self.svn_url.encode('utf8'),