Rev 1259: Canonicalize paths passed to reparent(). in file:///data/jelmer/bzr-svn/0.4-ra-cext/

Jelmer Vernooij jelmer at samba.org
Sun Jun 22 02:49:39 BST 2008


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

------------------------------------------------------------
revno: 1259
revision-id: jelmer at samba.org-20080622014937-c2gxuqd8tq8i1aod
parent: jelmer at samba.org-20080621232222-2afs0ebd06z0ptqj
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4-ra-cext
timestamp: Sun 2008-06-22 03:49:37 +0200
message:
  Canonicalize paths passed to reparent().
modified:
  ra.c                           ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
=== modified file 'ra.c'
--- a/ra.c	2008-06-21 23:12:53 +0000
+++ b/ra.c	2008-06-22 01:49:37 +0000
@@ -20,6 +20,7 @@
 #include <apr_general.h>
 #include <svn_types.h>
 #include <svn_ra.h>
+#include <svn_path.h>
 #include <apr_file_io.h>
 
 #include <structmember.h>
@@ -468,7 +469,7 @@
 	PyObject_HEAD
 	svn_ra_session_t *ra;
     apr_pool_t *pool;
-    char *url;
+    const char *url;
     PyObject *progress_func;
 	AuthObject *auth;
 	bool busy;
@@ -615,8 +616,8 @@
 	temp_pool = Pool();
 	if (temp_pool == NULL)
 		return NULL;
-	RUN_RA_WITH_POOL(temp_pool, ra, svn_ra_reparent(ra->ra, url, temp_pool));
-	ra->url = apr_pstrdup(ra->pool, url);
+	ra->url = svn_path_canonicalize(url, ra->pool);
+	RUN_RA_WITH_POOL(temp_pool, ra, svn_ra_reparent(ra->ra, ra->url, temp_pool));
 	apr_pool_destroy(temp_pool);
 	Py_RETURN_NONE;
 }




More information about the bazaar-commits mailing list