Rev 986: Fix last few references to old subversion bindings, fix exception handling. in file:///data/jelmer/bzr-svn/pyrex/
Jelmer Vernooij
jelmer at samba.org
Sun Mar 16 04:31:42 GMT 2008
At file:///data/jelmer/bzr-svn/pyrex/
------------------------------------------------------------
revno: 986
revision-id:jelmer at samba.org-20080316043139-wamvi3s8dli6k887
parent: jelmer at samba.org-20080316024633-xv5dzw3dhrz2nm5q
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pyrex
timestamp: Sun 2008-03-16 05:31:39 +0100
message:
Fix last few references to old subversion bindings, fix exception handling.
modified:
Makefile makefile.other-20080311181537-5svhje3v1flh1n4f-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
ra.pyx ra.pyx-20080313140933-qybkqaxe3m4mcll7-1
remote.py format.py-20060406233823-b6fa009fe35dfde7
setup.py setup.py-20060502115218-86950492da22353f
tests/test_commit.py test_commit.py-20060624213521-l5kcufywkh9mnilk-1
tests/test_convert.py test_convert.py-20060705203611-b1l0bapeku6foco0-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
tests/test_push.py test_push.py-20070201165715-g2ievcdfqi33wqsy-1
tests/test_radir.py test_radir.py-20061231173434-31utf9o4byu7wktm-1
tests/test_repos.py test_repos.py-20060508151940-ddc49a59257ca712
tests/test_workingtree.py test_workingtree.py-20060622191524-0di7bc3q1ckdbybb-1
wc.pyx wc.pyx-20080313142018-10l8l23vha2j9e6b-1
=== modified file 'Makefile'
--- a/Makefile 2008-03-15 19:13:59 +0000
+++ b/Makefile 2008-03-16 04:31:39 +0000
@@ -30,7 +30,7 @@
ln -sf `pwd` $(TMP_PLUGINS_DIR)/svn
check:: $(TMP_PLUGINS_DIR)/svn
- BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(DEBUGGER) $(PYTHON) $(BZR) selftest $(TEST_OPTIONS) $(TESTS)
+ LD_LIBRARY_PATH=/usr/local/lib BZR_PLUGIN_PATH=$(TMP_PLUGINS_DIR) $(DEBUGGER) $(PYTHON) $(BZR) selftest $(TEST_OPTIONS) $(TESTS)
check-verbose::
$(MAKE) check TEST_OPTIONS=-v
=== modified file 'format.py'
--- a/format.py 2008-03-15 20:33:59 +0000
+++ b/format.py 2008-03-16 04:31:39 +0000
@@ -85,7 +85,7 @@
"""See BzrDir.initialize_on_transport()."""
from transport import get_svn_ra_transport
from bzrlib.transport.local import LocalTransport
- import svn.repos
+ import repos
if not isinstance(transport, LocalTransport):
raise NotImplementedError(self.initialize,
@@ -93,7 +93,7 @@
"non-local transports")
local_path = transport._local_base.rstrip("/")
- svn.repos.create(local_path, '', '', None, None)
+ repos.create(local_path)
# All revision property changes
revprop_hook = os.path.join(local_path, "hooks", "pre-revprop-change")
open(revprop_hook, 'w').write("#!/bin/sh")
@@ -116,12 +116,12 @@
@classmethod
def probe_transport(klass, transport):
- import svn
from bzrlib.transport.local import LocalTransport
+ import wc
format = klass()
if isinstance(transport, LocalTransport) and \
- transport.has(svn.wc.get_adm_dir()):
+ transport.has(wc.get_adm_dir()):
return format
raise bzr_errors.NotBranchError(path=transport.base)
=== modified file 'mapping.py'
--- a/mapping.py 2008-03-13 21:04:01 +0000
+++ b/mapping.py 2008-03-16 04:31:39 +0000
@@ -23,7 +23,6 @@
import errors
from scheme import BranchingScheme, guess_scheme_from_branch_path
import sha
-import svn
import time
import urllib
=== modified file 'ra.pyx'
--- a/ra.pyx 2008-03-16 02:16:20 +0000
+++ b/ra.pyx 2008-03-16 04:31:39 +0000
@@ -175,10 +175,10 @@
long revision,
int start_empty,
char *lock_token,
- apr_pool_t *pool)
+ apr_pool_t *pool) except *
svn_error_t *(*delete_path)(void *report_baton,
- char *path, apr_pool_t *pool)
+ char *path, apr_pool_t *pool) except *
svn_error_t *(*link_path)(void *report_baton,
char *path,
@@ -186,11 +186,11 @@
long revision,
int start_empty,
char *lock_token,
- apr_pool_t *pool)
-
- svn_error_t *(*finish_report)(void *report_baton, apr_pool_t *pool)
-
- svn_error_t *(*abort_report)(void *report_baton, apr_pool_t *pool)
+ apr_pool_t *pool) except *
+
+ svn_error_t *(*finish_report)(void *report_baton, apr_pool_t *pool) except *
+
+ svn_error_t *(*abort_report)(void *report_baton, apr_pool_t *pool) except *
ctypedef void (*svn_ra_progress_notify_func_t)(apr_off_t progress,
apr_off_t total, void *baton, apr_pool_t *pool) except *
=== modified file 'remote.py'
--- a/remote.py 2008-03-15 15:52:16 +0000
+++ b/remote.py 2008-03-16 04:31:39 +0000
@@ -22,7 +22,7 @@
from bzrlib.transport.local import LocalTransport
from core import SubversionException
-import core, svn.repos
+import core
from errors import NoSvnRepositoryPresent
from format import get_rich_root_format, SvnRemoteFormat
=== modified file 'setup.py'
--- a/setup.py 2008-03-15 15:52:16 +0000
+++ b/setup.py 2008-03-16 04:31:39 +0000
@@ -17,7 +17,7 @@
def svn_include_dir():
"""Determine the Subversion header file location."""
- dirs = ["/usr/include/subversion-1", "/usr/local/include/subversion-1"]
+ dirs = ["/usr/local/include/subversion-1", "/usr/include/subversion-1"]
for dir in dirs:
if os.path.isdir(dir):
return dir
=== modified file 'tests/test_commit.py'
--- a/tests/test_commit.py 2008-03-12 15:01:25 +0000
+++ b/tests/test_commit.py 2008-03-16 04:31:39 +0000
@@ -32,7 +32,7 @@
from remote import SvnRaTransport
from tests import TestCaseWithSubversionRepository
-from svn.core import svn_time_to_cstring
+from core import time_to_cstring
class TestNativeCommit(TestCaseWithSubversionRepository):
def test_simple_commit(self):
=== modified file 'tests/test_convert.py'
--- a/tests/test_convert.py 2008-03-12 15:01:25 +0000
+++ b/tests/test_convert.py 2008-03-16 04:31:39 +0000
@@ -30,7 +30,7 @@
from scheme import TrunkBranchingScheme, NoBranchingScheme
from tests import TestCaseWithSubversionRepository
-import svn.repos
+import repos
class TestLoadDumpfile(TestCaseInTempDir):
def test_loaddumpfile(self):
@@ -51,8 +51,8 @@
PROPS-END
""")
load_dumpfile(dumpfile, "d")
- repos = svn.repos.open("d")
- fs = svn.repos.fs(repos)
+ repos = repos.Repository("d")
+ fs = repos.fs()
self.assertEqual("6987ef2d-cd6b-461f-9991-6f1abef3bd59",
svn.fs.get_uuid(fs))
=== modified file 'tests/test_errors.py'
--- a/tests/test_errors.py 2008-03-14 13:19:27 +0000
+++ b/tests/test_errors.py 2008-03-16 04:31:39 +0000
@@ -23,8 +23,7 @@
InvalidSvnBranchPath, NotSvnBranchPath)
from constants import ERR_UNKNOWN_HOSTNAME
-import svn.core
-from svn.core import SubversionException
+from core import SubversionException
class TestConvertError(TestCase):
def test_decorator_unknown(self):
@@ -37,7 +36,7 @@
def test_decorator_known(self):
@convert_svn_error
def test_throws_svn():
- raise SubversionException("Connection closed", svn.core.SVN_ERR_RA_SVN_CONNECTION_CLOSED)
+ raise SubversionException("Connection closed", constants.ERR_RA_SVN_CONNECTION_CLOSED)
self.assertRaises(ConnectionReset, test_throws_svn)
@@ -50,25 +49,25 @@
SubversionException)
def test_convert_malformed(self):
- self.assertIsInstance(convert_error(SubversionException("foo", svn.core.SVN_ERR_RA_SVN_MALFORMED_DATA)), TransportError)
+ self.assertIsInstance(convert_error(SubversionException("foo", constants.ERR_RA_SVN_MALFORMED_DATA)), TransportError)
def test_convert_error_reset(self):
- self.assertIsInstance(convert_error(SubversionException("Connection closed", svn.core.SVN_ERR_RA_SVN_CONNECTION_CLOSED)), ConnectionReset)
+ self.assertIsInstance(convert_error(SubversionException("Connection closed", constants.ERR_RA_SVN_CONNECTION_CLOSED)), ConnectionReset)
def test_convert_error_lock(self):
- self.assertIsInstance(convert_error(SubversionException("Working copy locked", svn.core.SVN_ERR_WC_LOCKED)), LockError)
+ self.assertIsInstance(convert_error(SubversionException("Working copy locked", constants.ERR_WC_LOCKED)), LockError)
def test_convert_perm_denied(self):
- self.assertIsInstance(convert_error(SubversionException("Permission Denied", svn.core.SVN_ERR_RA_NOT_AUTHORIZED)), PermissionDenied)
+ self.assertIsInstance(convert_error(SubversionException("Permission Denied", constants.ERR_RA_NOT_AUTHORIZED)), PermissionDenied)
def test_convert_unexpected_end(self):
- self.assertIsInstance(convert_error(SubversionException("Unexpected end of stream", svn.core.SVN_ERR_INCOMPLETE_DATA)), UnexpectedEndOfContainerError)
+ self.assertIsInstance(convert_error(SubversionException("Unexpected end of stream", constants.ERR_INCOMPLETE_DATA)), UnexpectedEndOfContainerError)
def test_convert_unknown_hostname(self):
self.assertIsInstance(convert_error(SubversionException("Unknown hostname 'bla'", SVN_ERR_UNKNOWN_HOSTNAME)), ConnectionError)
def test_not_implemented(self):
- self.assertIsInstance(convert_error(SubversionException("Remote server doesn't support ...", svn.core.SVN_ERR_RA_NOT_IMPLEMENTED)), NotImplementedError)
+ self.assertIsInstance(convert_error(SubversionException("Remote server doesn't support ...", constants.ERR_RA_NOT_IMPLEMENTED)), NotImplementedError)
def test_decorator_nothrow(self):
@convert_svn_error
=== modified file 'tests/test_push.py'
--- a/tests/test_push.py 2008-03-12 15:01:25 +0000
+++ b/tests/test_push.py 2008-03-16 04:31:39 +0000
@@ -30,7 +30,6 @@
import os
import format
-import svn.core
from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix
from time import sleep
from commit import push
=== modified file 'tests/test_radir.py'
--- a/tests/test_radir.py 2007-11-23 13:20:17 +0000
+++ b/tests/test_radir.py 2008-03-16 04:31:39 +0000
@@ -22,8 +22,6 @@
from bzrlib.errors import (NoRepositoryPresent, NotBranchError, NotLocalUrl,
NoWorkingTree, AlreadyBranchError)
-import svn
-
from format import SvnRemoteFormat
from tests import TestCaseWithSubversionRepository
from transport import SvnRaTransport
@@ -72,7 +70,7 @@
b = x.create_branch()
self.assertEquals(repos_url+"/trunk", b.base)
transport = SvnRaTransport(repos_url)
- self.assertEquals(svn.core.svn_node_dir,
+ self.assertEquals(core.NODE_DIR,
transport.check_path("trunk", 1))
def test_bad_dir(self):
=== modified file 'tests/test_repos.py'
--- a/tests/test_repos.py 2008-03-12 15:01:25 +0000
+++ b/tests/test_repos.py 2008-03-16 04:31:39 +0000
@@ -31,8 +31,6 @@
import os, sys
-import svn.fs
-
import format
from mapping import (escape_svn_path, unescape_svn_path,
SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_BRANCHING_SCHEME)
@@ -450,7 +448,7 @@
self.assertTrue(isinstance(bzrdir, BzrDir))
repository = bzrdir._find_repository()
fs = self.open_fs('c')
- self.assertEqual(svn.fs.get_uuid(fs), repository.uuid)
+ self.assertEqual(fs.get_uuid(fs), repository.uuid)
def test_get_inventory_weave(self):
bzrdir = self.make_client_and_bzrdir('d', 'dc')
=== modified file 'tests/test_workingtree.py'
--- a/tests/test_workingtree.py 2008-03-12 15:01:25 +0000
+++ b/tests/test_workingtree.py 2008-03-16 04:31:39 +0000
@@ -25,8 +25,7 @@
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
-import svn.core
-import svn.wc
+import core, wc
import os, sys
@@ -207,13 +206,13 @@
def test_get_ignore_list_empty(self):
self.make_client('a', 'dc')
tree = self.open_checkout("dc")
- self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config)), tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + wc.get_default_ignores(svn_config)), tree.get_ignore_list())
def test_get_ignore_list_onelevel(self):
self.make_client('a', 'dc')
self.client_set_prop("dc", "svn:ignore", "*.d\n*.c\n")
tree = self.open_checkout("dc")
- self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c"]), tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + wc.get_default_ignores(svn_config) + ["./*.d", "./*.c"]), tree.get_ignore_list())
def test_get_ignore_list_morelevel(self):
self.make_client('a', 'dc')
@@ -222,7 +221,7 @@
self.client_add("dc/x")
self.client_set_prop("dc/x", "svn:ignore", "*.e\n")
tree = self.open_checkout("dc")
- self.assertEqual(set([".svn"] + svn.wc.get_default_ignores(svn_config) + ["./*.d", "./*.c", "./x/*.e"]), tree.get_ignore_list())
+ self.assertEqual(set([".svn"] + wc.get_default_ignores(svn_config) + ["./*.d", "./*.c", "./x/*.e"]), tree.get_ignore_list())
def test_add_reopen(self):
self.make_client('a', 'dc')
=== modified file 'wc.pyx'
--- a/wc.pyx 2008-03-16 02:30:29 +0000
+++ b/wc.pyx 2008-03-16 04:31:39 +0000
@@ -126,6 +126,8 @@
char **pristine_path,
apr_pool_t *pool)
+ char *svn_wc_get_adm_dir(apr_pool_t *pool)
+
def version():
"""Get libsvn_wc version information.
@@ -284,6 +286,13 @@
def is_entry_prop(name):
return svn_wc_is_entry_prop(name)
+def get_adm_dir():
+ cdef apr_pool_t *pool
+ pool = Pool(NULL)
+ ret = svn_wc_get_adm_dir(pool)
+ apr_pool_destroy(pool)
+ return ret
+
def get_pristine_copy_path(path):
cdef apr_pool_t *pool
cdef char *pristine_path
More information about the bazaar-commits
mailing list