Rev 1249: Fix build with C-based repos module. in file:///data/jelmer/bzr-svn/0.4-repos-cext/

[Jelmer Vernooij]

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

------------------------------------------------------------
revno: 1249
revision-id: jelmer at samba.org-20080622080012-ei0y16lts2z3hcb6
parent: jelmer at samba.org-20080622074440-ag2v3unt934qpmej
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4-repos-cext
timestamp: Sun 2008-06-22 10:00:12 +0200
message:
  Fix build with C-based repos module.
removed:
  repos.py                       repos.py-20080621160832-kvb89lus284oufuq-1
modified:
  repos.c                        repos.pyx-20080314114432-g2b5lqe776tkbl4k-1
=== modified file 'repos.c'
--- a/repos.c	2008-06-19 17:20:13 +0000
+++ b/repos.c	2008-06-22 08:00:12 +0000
@@ -45,7 +45,7 @@
 	if (!PyArg_ParseTuple(args, "s|OO", &path, &config, &fs_config))
 		return NULL;
 
-    pool = Pool();
+    pool = Pool(NULL);
 	if (pool == NULL)
 		return NULL;
     hash_config = apr_hash_make(pool); /* FIXME */
@@ -83,7 +83,7 @@
 	if (ret == NULL)
 		return NULL;
 
-	ret->pool = Pool();
+	ret->pool = Pool(NULL);
 	if (ret->pool == NULL)
 		return NULL;
     if (!check_error(svn_repos_open(&ret->repos, path, ret->pool))) {
@@ -134,7 +134,7 @@
 	PyObject *ret;
 	apr_pool_t *temp_pool;
 
-	temp_pool = Pool();
+	temp_pool = Pool(NULL);
 	if (temp_pool == NULL)
 		return NULL;
 	RUN_SVN_WITH_POOL(temp_pool, svn_fs_get_uuid(fsobj->fs, &uuid, temp_pool));
@@ -184,7 +184,7 @@
 								&cancel_func))
 		return NULL;
 
-	temp_pool = Pool();
+	temp_pool = Pool(NULL);
 	if (temp_pool == NULL)
 		return NULL;
 	RUN_SVN_WITH_POOL(temp_pool, svn_repos_load_fs2(reposobj->repos, 
@@ -229,7 +229,7 @@
 		return;
 
 	apr_initialize();
-	pool = Pool();
+	pool = Pool(NULL);
 	if (pool == NULL)
 		return;
 

=== removed file 'repos.py'
--- a/repos.py	2008-06-22 07:43:04 +0000
+++ b/repos.py	1970-01-01 00:00:00 +0000
@@ -1,50 +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.repos
-
-LOAD_UUID_IGNORE = svn.repos.load_uuid_ignore
-LOAD_UUID_FORCE = svn.repos.load_uuid_force
-LOAD_UUID_DEFAULT = svn.repos.load_uuid_default
-
-def create(path):
-    r = svn.repos.create(path, '', '', None, None)
-    return Repository(path, r)
-
-class Fs(object):
-    def __init__(self, fs):
-        self.fs = fs
-
-    def get_uuid(self):
-        return svn.fs.get_uuid(self.fs)
-
-
-class Repository(object):
-    def __init__(self, local_path, _repos=None):
-        if _repos is not None:
-            self.repos = _repos
-        else:
-            self.repos = svn.repos.svn_repos_open(local_path)
-
-    def fs(self):
-        return Fs(svn.repos.fs(self.repos))
-
-    def load_fs(self, dumpstream, feedback_stream, uuid_action=LOAD_UUID_DEFAULT,
-                parent_dir="", use_pre_commit_hook=False, use_post_commit_hook=False, 
-                cancel_func=None):
-        return svn.repos.load_fs2(self.repos, dumpstream, feedback_stream, uuid_action,
-                parent_dir, use_pre_commit_hook, use_post_commit_hook, cancel_func)
-
-