Rev 1228: Avoid more direct imports of python subversion bindings. in http://people.samba.org/bzr/jelmer/bzr-svn/0.4/
Jelmer Vernooij
jelmer at samba.org
Sun Jun 15 03:11:26 BST 2008
At http://people.samba.org/bzr/jelmer/bzr-svn/0.4/
------------------------------------------------------------
revno: 1228
revision-id: jelmer at samba.org-20080615021124-dceio82c5ml5006m
parent: jelmer at samba.org-20080615014628-vr9qbhs2nmtfujff
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Sun 2008-06-15 04:11:24 +0200
message:
Avoid more direct imports of python subversion bindings.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
config.py config.py-20070624185721-0j8f1ly75uo4s1lk-1
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
fetch.py fetch.py-20060625004942-x2lfaib8ra707a8p-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'branch.py'
--- a/branch.py 2008-06-15 01:08:06 +0000
+++ b/branch.py 2008-06-15 02:11:24 +0000
@@ -25,11 +25,11 @@
from bzrlib.workingtree import WorkingTree
import svn.client, svn.core
-from svn.core import SubversionException
from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.commit import push
from bzrlib.plugins.svn.config import BranchConfig
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import NotSvnBranchPath, ERR_FS_NO_SUCH_REVISION
from bzrlib.plugins.svn.format import get_rich_root_format
from bzrlib.plugins.svn.repository import SvnRepository
=== modified file 'branchprops.py'
--- a/branchprops.py 2008-06-05 17:54:39 +0000
+++ b/branchprops.py 2008-06-15 02:11:24 +0000
@@ -19,11 +19,9 @@
from bzrlib.errors import NoSuchRevision
from bzrlib.trace import mutter
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION
-from svn.core import SubversionException
-import svn.core
-
class PathPropertyProvider(object):
def __init__(self, log):
=== modified file 'config.py'
--- a/config.py 2008-06-05 17:39:43 +0000
+++ b/config.py 2008-06-15 02:11:24 +0000
@@ -21,9 +21,7 @@
import os
from bzrlib.plugins.svn import properties
-
-import svn.core
-from svn.core import SubversionException
+from bzrlib.plugins.svn.core import SubversionException
# Settings are stored by UUID.
# Data stored includes default branching scheme and locations the repository
=== modified file 'errors.py'
--- a/errors.py 2008-06-08 23:25:27 +0000
+++ b/errors.py 2008-06-15 02:11:24 +0000
@@ -21,7 +21,7 @@
TransportError, UnexpectedEndOfContainerError)
import urllib
-import svn.core
+from bzrlib.plugins.svn import core
class InvalidExternalsDescription(BzrError):
@@ -129,7 +129,7 @@
def convert(*args, **kwargs):
try:
return unbound(*args, **kwargs)
- except svn.core.SubversionException, e:
+ except core.SubversionException, e:
raise convert_error(e)
convert.__doc__ = unbound.__doc__
=== modified file 'fetch.py'
--- a/fetch.py 2008-06-06 17:19:53 +0000
+++ b/fetch.py 2008-06-15 02:11:24 +0000
@@ -26,7 +26,7 @@
import md5
from svn.core import Pool
-import svn.core
+import svn.delta
from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.errors import InvalidFileName
=== modified file 'format.py'
--- a/format.py 2008-06-05 17:54:39 +0000
+++ b/format.py 2008-06-15 02:11:24 +0000
@@ -52,12 +52,12 @@
@classmethod
def probe_transport(klass, transport):
from transport import get_svn_ra_transport
- import svn.core
+ from bzrlib.plugins.svn import core
format = klass()
try:
transport = get_svn_ra_transport(transport)
- except svn.core.SubversionException, (_, num):
+ except core.SubversionException, (_, num):
if num in (errors.ERR_RA_ILLEGAL_URL, \
errors.ERR_RA_LOCAL_REPOS_OPEN_FAILED, \
errors.ERR_BAD_URL):
@@ -66,10 +66,10 @@
return format
def _open(self, transport):
- import svn.core
+ from bzrlib.plugins.svn import core
try:
return remote.SvnRemoteAccess(transport, self)
- except svn.core.SubversionException, (_, num):
+ except core.SubversionException, (_, num):
if num == errors.ERR_RA_DAV_REQUEST_FAILED:
raise bzr_errors.NotBranchError(transport.base)
raise
@@ -128,12 +128,13 @@
def _open(self, transport):
import svn.core
from workingtree import SvnCheckout
+ from bzrlib.plugins.svn import core
subr_version = svn.core.svn_subr_version()
if subr_version.major == 1 and subr_version.minor < 4:
raise errors.NoCheckoutSupport()
try:
return SvnCheckout(transport, self)
- except svn.core.SubversionException, (_, num):
+ except core.SubversionException, (_, num):
if num in (errors.ERR_RA_LOCAL_REPOS_OPEN_FAILED,):
raise errors.NoSvnRepositoryPresent(transport.base)
raise
=== modified file 'logwalker.py'
--- a/logwalker.py 2008-06-15 01:08:06 +0000
+++ b/logwalker.py 2008-06-15 02:11:24 +0000
@@ -20,13 +20,13 @@
from bzrlib.trace import mutter
import bzrlib.ui as ui
-from svn.core import SubversionException, Pool
-from transport import SvnRaTransport
-import svn.core
+from svn.core import Pool
from bzrlib.plugins.svn import changes, core
from bzrlib.plugins.svn.cache import CacheTable
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
+from bzrlib.plugins.svn.transport import SvnRaTransport
LOG_CHUNK_LIMIT = 0
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-06-08 23:25:27 +0000
+++ b/mapping3/__init__.py 2008-06-15 02:11:24 +0000
@@ -17,14 +17,14 @@
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
from bzrlib.plugins.svn import mapping, properties
+from bzrlib.plugins.svn.core import SubversionException, NODE_DIR
from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_NOT_FOUND, ERR_RA_DAV_PATH_NOT_FOUND
from bzrlib.plugins.svn.layout import RepositoryLayout
from bzrlib.plugins.svn.mapping3.scheme import (BranchingScheme, guess_scheme_from_branch_path,
guess_scheme_from_history, ListBranchingScheme,
parse_list_scheme_text, NoBranchingScheme,
TrunkBranchingScheme, ListBranchingScheme)
-import sha, svn
-from svn.core import SubversionException
+import sha
SVN_PROP_BZR_BRANCHING_SCHEME = 'bzr:branching-scheme'
@@ -67,7 +67,7 @@
def get_branches(self, revnum, project=""):
def check_path(path):
- return self.repository.transport.check_path(path, revnum) == svn.core.svn_node_dir
+ return self.repository.transport.check_path(path, revnum) == NODE_DIR
def find_children(path):
try:
dirents = self.repository.transport.get_dir(path, revnum)[0]
=== modified file 'revids.py'
--- a/revids.py 2008-06-06 17:19:53 +0000
+++ b/revids.py 2008-06-15 02:11:24 +0000
@@ -20,10 +20,8 @@
from bzrlib.errors import (InvalidRevisionId, NoSuchRevision)
from bzrlib.trace import mutter
-import svn.core
-from svn.core import SubversionException
-
from bzrlib.plugins.svn.cache import CacheTable
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import InvalidPropertyValue, ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_DIRECTORY
from bzrlib.plugins.svn.mapping import (parse_revision_id, BzrSvnMapping,
SVN_PROP_BZR_REVISION_ID, parse_revid_property)
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-06-05 10:21:04 +0000
+++ b/tests/__init__.py 2008-06-15 02:11:24 +0000
@@ -29,7 +29,7 @@
from bzrlib.urlutils import local_path_to_url
from bzrlib.workingtree import WorkingTree
-import svn.repos, svn.wc
+import svn.core, svn.repos, svn.wc
from bzrlib.plugins.svn.errors import NoCheckoutSupport
class TestCaseWithSubversionRepository(TestCaseInTempDir):
=== modified file 'transport.py'
--- a/transport.py 2008-06-15 01:21:52 +0000
+++ b/transport.py 2008-06-15 02:11:24 +0000
@@ -21,12 +21,13 @@
from bzrlib.trace import mutter
from bzrlib.transport import Transport
-from svn.core import SubversionException, Pool
+from svn.core import Pool
import svn.ra
import svn.core
import svn.client
from bzrlib.plugins.svn import properties
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent, ERR_BAD_URL, ERR_RA_SVN_REPOS_NOT_FOUND, ERR_FS_ALREADY_EXISTS, ERR_FS_NOT_FOUND, ERR_FS_NOT_DIRECTORY
from bzrlib.plugins.svn.ra import DIRENT_KIND
import urlparse
@@ -40,7 +41,7 @@
def create_svn_client(url):
- from auth import create_auth_baton
+ from bzrlib.plugins.svn.auth import create_auth_baton
client = svn.client.create_context()
client.auth_baton = create_auth_baton(url)
client.config = svn_config
=== modified file 'tree.py'
--- a/tree.py 2008-06-15 01:08:06 +0000
+++ b/tree.py 2008-06-15 02:11:24 +0000
@@ -28,7 +28,7 @@
from cStringIO import StringIO
import urllib
-import svn.core, svn.wc, svn.delta
+import svn.wc, svn.delta
from svn.core import Pool
from bzrlib.plugins.svn import errors, properties, core
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-06-15 01:08:06 +0000
+++ b/workingtree.py 2008-06-15 02:11:24 +0000
@@ -36,14 +36,14 @@
from bzrlib.plugins.svn.branch import SvnBranch
from bzrlib.plugins.svn.commit import _revision_id_to_svk_feature
from bzrlib.plugins.svn.convert import SvnConverter
-from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY
+from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn.errors import LocalCommitsUnsupported, NoCheckoutSupport, NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_ANCESTRY, SVN_PROP_BZR_FILEIDS,
SVN_PROP_BZR_REVISION_ID, SVN_PROP_BZR_REVISION_INFO,
- generate_revision_metadata)
+ escape_svn_path, generate_revision_metadata)
from bzrlib.plugins.svn.remote import SvnRemoteAccess
from bzrlib.plugins.svn.repository import SvnRepository
from bzrlib.plugins.svn.svk import SVN_PROP_SVK_MERGE, parse_svk_features, serialize_svk_features
-from bzrlib.plugins.svn.mapping import escape_svn_path
from bzrlib.plugins.svn.transport import (SvnRaTransport, bzr_to_svn_url, create_svn_client,
svn_config)
from bzrlib.plugins.svn.tree import SvnBasisTree
@@ -52,9 +52,7 @@
import urllib
import svn.core, svn.wc
-from svn.core import SubversionException
-from bzrlib.plugins.svn.errors import NoCheckoutSupport
from bzrlib.plugins.svn.format import get_rich_root_format
def generate_ignore_list(ignore_map):
More information about the bazaar-commits
mailing list