Rev 1088: Merge error code improvements from 0.4. in file:///data/jelmer/bzr-svn/cext/
Jelmer Vernooij
jelmer at samba.org
Thu Jun 5 19:08:35 BST 2008
At file:///data/jelmer/bzr-svn/cext/
------------------------------------------------------------
revno: 1088
revision-id: jelmer at samba.org-20080605180834-3nsygejr7vqmkdvs
parent: jelmer at samba.org-20080605174124-olk2dj0tkdcms8b1
parent: jelmer at samba.org-20080605175439-4qlkiutmdxkgh1o7
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: cext
timestamp: Thu 2008-06-05 20:08:34 +0200
message:
Merge error code improvements from 0.4.
removed:
constants.py constants.py-20080313210342-fuq3eruf2102bwml-1
modified:
auth.py auth.py-20071209174622-w8d42k6nm5yhxvi8-1
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
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
mapping.py mapping.py-20080128201303-6cp01phc0dmc0kiv-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/__init__.py __init__.py-20060508151940-e9f4d914801a2535
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
tree.py tree.py-20060624222557-dudlwqcmkf22lt2s-1
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
------------------------------------------------------------
revno: 950.3.154
revision-id: jelmer at samba.org-20080605175439-4qlkiutmdxkgh1o7
parent: jelmer at samba.org-20080605173943-whodsmk0029hq46v
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.4
timestamp: Thu 2008-06-05 19:54:39 +0200
message:
Move definition of error codes.
modified:
branch.py svnbranch.py-20051017135706-11c749eb0dab04a7
branchprops.py branchprops.py-20061223204623-80lvm7pjrpsgk0dd-1
commit.py commit.py-20060607190346-qvq128wgfubhhgm2-1
convert.py svn2bzr.py-20051018015439-cb4563bff29e632d
errors.py errors.py-20061226172623-w1sbj8ynpo0eojqp-1
format.py format.py-20070917005147-94kb7zysotf82kqw-1
logwalker.py logwalker.py-20060621215743-c13fhfnyzh1xzwh2-1
mapping3/__init__.py __init__.py-20080502174630-9324zh25kka98vlw-1
repository.py repository.py-20060306123302-1f8c5069b3fe0265
revids.py revids.py-20070416220458-36vfa0730cchevp1-1
tests/test_errors.py test_errors.py-20070129114605-ban03f32t6ja14ez-1
transport.py transport.py-20060406231150-b3472d06b3a0818d
workingtree.py workingtree.py-20060306120941-b083cb0fdd4a69de
=== modified file 'auth.py'
--- a/auth.py 2008-06-05 17:05:57 +0000
+++ b/auth.py 2008-06-05 18:08:34 +0000
@@ -27,7 +27,7 @@
get_ssl_server_trust_file_provider,
Auth
)
-from bzrlib.plugins.svn import constants, ra
+from bzrlib.plugins.svn import ra
import urlparse
import urllib
@@ -81,11 +81,11 @@
credentials.has_key("verify_certificates") and
credentials["verify_certificates"] == False):
accepted_failures = (
- constants.AUTH_SSL_NOTYETVALID +
- constants.AUTH_SSL_EXPIRED +
- constants.AUTH_SSL_CNMISMATCH +
- constants.AUTH_SSL_UNKNOWNCA +
- constants.AUTH_SSL_OTHER)
+ AUTH_SSL_NOTYETVALID +
+ AUTH_SSL_EXPIRED +
+ AUTH_SSL_CNMISMATCH +
+ AUTH_SSL_UNKNOWNCA +
+ AUTH_SSL_OTHER)
else:
accepted_failures = 0
return (accepted_failures, False)
@@ -177,7 +177,7 @@
if creds is not None:
(user, password) = urllib.splitpasswd(creds)
if user is not None:
- auth_baton.set_parameter(constants.AUTH_PARAM_DEFAULT_USERNAME, user)
+ auth_baton.set_parameter(AUTH_PARAM_DEFAULT_USERNAME, user)
if password is not None:
- auth_baton.set_parameter(constants.AUTH_PARAM_DEFAULT_PASSWORD, password)
+ auth_baton.set_parameter(AUTH_PARAM_DEFAULT_PASSWORD, password)
return auth_baton
=== modified file 'branch.py'
--- a/branch.py 2008-06-05 16:49:00 +0000
+++ b/branch.py 2008-06-05 18:08:34 +0000
@@ -24,11 +24,11 @@
from bzrlib.revision import is_null, ensure_null, NULL_REVISION
from bzrlib.workingtree import WorkingTree
-from bzrlib.plugins.svn import constants, core
+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
+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
from bzrlib.plugins.svn.transport import bzr_to_svn_url
@@ -80,7 +80,7 @@
revnum) != core.NODE_DIR:
raise NotBranchError(self.base)
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NotBranchError(self.base)
raise
if not self.mapping.is_branch(branch_path):
=== modified file 'branchprops.py'
--- a/branchprops.py 2008-06-05 17:05:57 +0000
+++ b/branchprops.py 2008-06-05 18:08:34 +0000
@@ -19,8 +19,8 @@
from bzrlib.errors import NoSuchRevision
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import constants
from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION
class PathPropertyProvider(object):
@@ -41,7 +41,7 @@
(_, _, props) = self.log._transport.get_dir(path,
revnum)
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(self, revnum)
raise
=== modified file 'commit.py'
--- a/commit.py 2008-06-05 17:34:37 +0000
+++ b/commit.py 2008-06-05 18:08:34 +0000
@@ -21,8 +21,7 @@
from bzrlib import debug, osutils, urlutils
from bzrlib.branch import Branch
from bzrlib.errors import (BzrError, InvalidRevisionId, DivergedBranches,
- UnrelatedBranches, AppendRevisionsOnlyViolation,
- )
+ UnrelatedBranches, AppendRevisionsOnlyViolation)
from bzrlib.inventory import Inventory
from bzrlib.repository import RootCommitBuilder, InterRepository
from bzrlib.revision import NULL_REVISION
@@ -32,8 +31,7 @@
from cStringIO import StringIO
-from bzrlib.plugins.svn import constants
-from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed
+from bzrlib.plugins.svn.errors import ChangesRootLHSHistory, MissingPrefix, RevpropChangeFailed, ERR_FS_TXN_OUT_OF_DATE, ERR_REPOS_DISABLED_FEATURE
from bzrlib.plugins.svn.svk import (generate_svk_feature, serialize_svk_features,
parse_svk_features, SVN_PROP_SVK_MERGE)
from bzrlib.plugins.svn.logwalker import lazy_dict
@@ -85,7 +83,7 @@
for (name, value) in revprops.items():
try:
transport.change_rev_prop(revnum, name, value)
- except SubversionException, (_, constants.ERR_REPOS_DISABLED_FEATURE):
+ except SubversionException, (_, ERR_REPOS_DISABLED_FEATURE):
raise RevpropChangeFailed(name)
@@ -691,7 +689,7 @@
try:
builder.commit(rev.message)
except SubversionException, (_, num):
- if num == constants.ERR_FS_TXN_OUT_OF_DATE:
+ if num == ERR_FS_TXN_OUT_OF_DATE:
raise DivergedBranches(source, target)
raise
except ChangesRootLHSHistory:
=== removed file 'constants.py'
--- a/constants.py 2008-06-05 17:34:37 +0000
+++ b/constants.py 1970-01-01 00:00:00 +0000
@@ -1,45 +0,0 @@
-# Copyright (C) 2005-2008 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/>.
-
-ERR_UNKNOWN_HOSTNAME = 670002
-ERR_RA_SVN_CONNECTION_CLOSED = 210002
-ERR_WC_LOCKED = 155004
-ERR_RA_NOT_AUTHORIZED = 170001
-ERR_INCOMPLETE_DATA = 200003
-ERR_RA_SVN_MALFORMED_DATA = 210004
-ERR_RA_NOT_IMPLEMENTED = 170003
-ERR_FS_NO_SUCH_REVISION = 160006
-ERR_FS_TXN_OUT_OF_DATE = 160028
-ERR_REPOS_DISABLED_FEATURE = 165006
-ERR_STREAM_MALFORMED_DATA = 140001
-ERR_RA_ILLEGAL_URL = 170000
-ERR_RA_LOCAL_REPOS_OPEN_FAILED = 180001
-ERR_BAD_URL = 125002
-ERR_RA_DAV_REQUEST_FAILED = 175002
-ERR_FS_NOT_DIRECTORY = 160016
-ERR_FS_NOT_FOUND = 160013
-ERR_FS_ALREADY_EXISTS = 160020
-ERR_RA_SVN_REPOS_NOT_FOUND = 210005
-ERR_WC_NOT_DIRECTORY = 155007
-ERR_ENTRY_EXISTS = 150002
-ERR_WC_PATH_NOT_FOUND = 155010
-ERR_CANCELLED = 200015
-ERR_WC_UNSUPPORTED_FORMAT = 155021
-
-AUTH_SSL_NOTYETVALID = 0x00000001
-AUTH_SSL_EXPIRED = 0x00000002
-AUTH_SSL_CNMISMATCH = 0x00000004
-AUTH_SSL_UNKNOWNCA = 0x00000008
-AUTH_SSL_OTHER = 0x40000000
=== modified file 'convert.py'
--- a/convert.py 2008-06-05 17:41:24 +0000
+++ b/convert.py 2008-06-05 18:08:34 +0000
@@ -18,13 +18,14 @@
from bzrlib.bzrdir import BzrDir, Converter
from bzrlib.branch import Branch
from bzrlib.errors import (BzrError, NotBranchError, NoSuchFile,
- NoRepositoryPresent, NoSuchRevision)
+ NoRepositoryPresent, NoSuchRevision)
from bzrlib.repository import InterRepository
from bzrlib.revision import ensure_null
from bzrlib.transport import get_transport
+from bzrlib.plugins.svn.errors import ERR_STREAM_MALFORMED_DATA
from bzrlib.plugins.svn.format import get_rich_root_format
-from bzrlib.plugins.svn import core, repos, constants
+from bzrlib.plugins.svn import core, repos
from bzrlib.plugins.svn.core import SubversionException
def transport_makedirs(transport, location_url):
@@ -73,7 +74,7 @@
try:
r.load_fs(file, StringIO(), repos.LOAD_UUID_DEFAULT)
except SubversionException, (_, num):
- if num == constants.ERR_STREAM_MALFORMED_DATA:
+ if num == ERR_STREAM_MALFORMED_DATA:
raise NotDumpFile(dumpfile)
raise
return r
=== modified file 'errors.py'
--- a/errors.py 2008-06-03 10:50:22 +0000
+++ b/errors.py 2008-06-05 18:08:34 +0000
@@ -21,14 +21,40 @@
TransportError, UnexpectedEndOfContainerError)
import urllib
-import core
-from bzrlib.plugins.svn import constants
+from bzrlib.plugins.svn import core
class InvalidExternalsDescription(BzrError):
_fmt = """Unable to parse externals description."""
+ERR_UNKNOWN_HOSTNAME = 670002
+ERR_UNKNOWN_HOSTNAME = 670002
+ERR_RA_SVN_CONNECTION_CLOSED = 210002
+ERR_WC_LOCKED = 155004
+ERR_RA_NOT_AUTHORIZED = 170001
+ERR_INCOMPLETE_DATA = 200003
+ERR_RA_SVN_MALFORMED_DATA = 210004
+ERR_RA_NOT_IMPLEMENTED = 170003
+ERR_FS_NO_SUCH_REVISION = 160006
+ERR_FS_TXN_OUT_OF_DATE = 160028
+ERR_REPOS_DISABLED_FEATURE = 165006
+ERR_STREAM_MALFORMED_DATA = 140001
+ERR_RA_ILLEGAL_URL = 170000
+ERR_RA_LOCAL_REPOS_OPEN_FAILED = 180001
+ERR_BAD_URL = 125002
+ERR_RA_DAV_REQUEST_FAILED = 175002
+ERR_FS_NOT_DIRECTORY = 160016
+ERR_FS_NOT_FOUND = 160013
+ERR_FS_ALREADY_EXISTS = 160020
+ERR_RA_SVN_REPOS_NOT_FOUND = 210005
+ERR_WC_NOT_DIRECTORY = 155007
+ERR_ENTRY_EXISTS = 150002
+ERR_WC_PATH_NOT_FOUND = 155010
+ERR_CANCELLED = 200015
+ERR_WC_UNSUPPORTED_FORMAT = 155021
+
+
class NotSvnBranchPath(NotBranchError):
"""Error raised when a path was specified that did not exist."""
_fmt = """%(path)s is not a valid Subversion branch path.
@@ -74,19 +100,19 @@
"""
(msg, num) = err.args
- if num == constants.ERR_RA_SVN_CONNECTION_CLOSED:
+ if num == ERR_RA_SVN_CONNECTION_CLOSED:
return ConnectionReset(msg=msg)
- elif num == constants.ERR_WC_LOCKED:
+ elif num == ERR_WC_LOCKED:
return LockError(message=msg)
- elif num == constants.ERR_RA_NOT_AUTHORIZED:
+ elif num == ERR_RA_NOT_AUTHORIZED:
return PermissionDenied('.', msg)
- elif num == constants.ERR_INCOMPLETE_DATA:
+ elif num == ERR_INCOMPLETE_DATA:
return UnexpectedEndOfContainerError()
- elif num == constants.ERR_RA_SVN_MALFORMED_DATA:
+ elif num == ERR_RA_SVN_MALFORMED_DATA:
return TransportError("Malformed data", msg)
- elif num == constants.ERR_RA_NOT_IMPLEMENTED:
+ elif num == ERR_RA_NOT_IMPLEMENTED:
return NotImplementedError("Function not implemented in remote server")
- elif num == constants.ERR_UNKNOWN_HOSTNAME:
+ elif num == ERR_UNKNOWN_HOSTNAME:
return ConnectionError(msg=msg)
elif num > 0 and num < 1000:
return OSError(num, msg)
=== modified file 'fetch.py'
--- a/fetch.py 2008-06-05 17:34:37 +0000
+++ b/fetch.py 2008-06-05 18:08:34 +0000
@@ -25,8 +25,6 @@
from cStringIO import StringIO
import md5
-import constants
-
from bzrlib.plugins.svn.delta import apply_txdelta_handler
from bzrlib.plugins.svn import properties
from bzrlib.plugins.svn.errors import InvalidFileName
@@ -363,7 +361,7 @@
return apply_txdelta_handler(self.file_data, self.file_stream)
def change_prop(self, name, value):
- if name == constants.PROP_EXECUTABLE:
+ if name == properties.PROP_EXECUTABLE:
# You'd expect executable to match
# constants.PROP_EXECUTABLE_VALUE, but that's not
# how SVN behaves. It appears to consider the presence
=== modified file 'format.py'
--- a/format.py 2008-06-04 18:56:53 +0000
+++ b/format.py 2008-06-05 18:08:34 +0000
@@ -23,7 +23,7 @@
import os
lazy_import(globals(), """
-from bzrlib.plugins.svn import constants, errors, remote
+from bzrlib.plugins.svn import errors, remote
from bzrlib import errors as bzr_errors
""")
@@ -51,25 +51,25 @@
@classmethod
def probe_transport(klass, transport):
from transport import get_svn_ra_transport
- import core
+ from bzrlib.plugins.svn.core import SubversionException
format = klass()
try:
transport = get_svn_ra_transport(transport)
- except core.SubversionException, (_, num):
- if num in (constants.ERR_RA_ILLEGAL_URL, \
- constants.ERR_RA_LOCAL_REPOS_OPEN_FAILED, \
- constants.ERR_BAD_URL):
+ except SubversionException, (_, num):
+ if num in (errors.ERR_RA_ILLEGAL_URL, \
+ errors.ERR_RA_LOCAL_REPOS_OPEN_FAILED, \
+ errors.ERR_BAD_URL):
raise bzr_errors.NotBranchError(path=transport.base)
return format
def _open(self, transport):
- import core
+ from bzrlib.plugins.svn.core import SubversionException
try:
return remote.SvnRemoteAccess(transport, self)
- except core.SubversionException, (_, num):
- if num == constants.ERR_RA_DAV_REQUEST_FAILED:
+ except SubversionException, (_, num):
+ if num == errors.ERR_RA_DAV_REQUEST_FAILED:
raise bzr_errors.NotBranchError(transport.base)
raise
@@ -125,12 +125,12 @@
raise bzr_errors.NotBranchError(path=transport.base)
def _open(self, transport):
- import core
+ from bzrlib.plugins.svn.core import SubversionException
from workingtree import SvnCheckout
try:
return SvnCheckout(transport, self)
- except core.SubversionException, (_, num):
- if num in (constants.ERR_RA_LOCAL_REPOS_OPEN_FAILED,):
+ except 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-05 17:05:57 +0000
+++ b/logwalker.py 2008-06-05 18:08:34 +0000
@@ -22,9 +22,10 @@
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.transport import SvnRaTransport
-from bzrlib.plugins.svn import core, constants
+from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.cache import CacheTable
+from bzrlib.plugins.svn.errors import ERR_FS_NO_SUCH_REVISION, ERR_FS_NOT_FOUND
from bzrlib.plugins.svn import changes
from bzrlib.plugins.svn.ra import DIRENT_KIND
@@ -291,7 +292,7 @@
finally:
pb.finished()
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(branch=self,
revision="Revision number %d" % to_revnum)
raise
@@ -333,10 +334,10 @@
try:
return self._transport.iter_log([path], revnum, 0, 2, True, False, []).next()[1]
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(branch=self,
revision="Revision number %d" % revnum)
- if num == constants.ERR_FS_NOT_FOUND:
+ if num == ERR_FS_NOT_FOUND:
return None
raise
@@ -363,7 +364,7 @@
revprops = lazy_dict(known_revprops, self._transport.revprop_list, revnum)
yield (revpaths, revnum, revprops)
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(branch=self,
revision="Revision number %d" % from_revnum)
raise
@@ -383,7 +384,7 @@
return struct_revpaths_to_tuples(
self._transport.iter_log(None, revnum, revnum, 1, True, True, []).next()[0])
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(branch=self,
revision="Revision number %d" % revnum)
raise
@@ -425,7 +426,7 @@
try:
paths = struct_revpaths_to_tuples(self._transport.iter_log([path], revnum, revnum, 1, True, False, []).next()[0])
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(branch=self,
revision="Revision number %d" % revnum)
raise
=== modified file 'mapping.py'
--- a/mapping.py 2008-06-05 17:34:37 +0000
+++ b/mapping.py 2008-06-05 18:08:34 +0000
@@ -19,7 +19,7 @@
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import core, constants, version_info, constants, errors, properties
+from bzrlib.plugins.svn import core, constants, version_info, errors, properties
import calendar
import sha
import time
=== modified file 'mapping3/__init__.py'
--- a/mapping3/__init__.py 2008-06-05 17:34:37 +0000
+++ b/mapping3/__init__.py 2008-06-05 18:08:34 +0000
@@ -16,7 +16,8 @@
from bzrlib import osutils, ui
from bzrlib.errors import InvalidRevisionId
from bzrlib.trace import mutter
-from bzrlib.plugins.svn import core, constants, mapping, properties
+from bzrlib.plugins.svn import core, mapping, properties
+from bzrlib.plugins.svn.errors import ERR_FS_NOT_DIRECTORY, ERR_FS_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,
@@ -70,10 +71,10 @@
try:
assert not path.startswith("/")
dirents = self.repository.transport.get_dir(path, revnum)[0]
- except core.SubversionException, (msg, num):
- if num == constants.ERR_FS_NOT_DIRECTORY:
+ except SubversionException, (msg, num):
+ if num == ERR_FS_NOT_DIRECTORY:
return None
- if num == constants.ERR_FS_NOT_FOUND:
+ if num == ERR_FS_NOT_FOUND:
return None
raise
return dirents.keys()
=== modified file 'repository.py'
--- a/repository.py 2008-06-05 15:24:31 +0000
+++ b/repository.py 2008-06-05 18:08:34 +0000
@@ -30,20 +30,16 @@
from bzrlib.transport import Transport, get_transport
from bzrlib.trace import info, mutter
-from core import SubversionException
-import core
-import constants
import os
+from bzrlib.plugins.svn import changes, core, errors, logwalker
from bzrlib.plugins.svn.branchprops import PathPropertyProvider
from bzrlib.plugins.svn.cache import create_cache_dir, sqlite3
-from bzrlib.plugins.svn import changes
+from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.changes import changes_path, find_prev_location
from bzrlib.plugins.svn.config import SvnRepositoryConfig
from bzrlib.plugins.svn.parents import SqliteCachingParentsProvider
-from bzrlib.plugins.svn import errors
-from bzrlib.plugins.svn import logwalker
from bzrlib.plugins.svn.mapping import (SVN_PROP_BZR_REVISION_ID, SVN_REVPROP_BZR_SIGNATURE,
parse_revision_metadata, parse_revid_property,
parse_merge_property, BzrSvnMapping,
@@ -382,7 +378,7 @@
try:
return (core.NODE_DIR == self.transport.check_path(path, revnum))
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
return False
raise
@@ -735,7 +731,7 @@
elif (layout.is_branch_parent(n) or
layout.is_tag_parent(n)):
parents.append(n)
- except SubversionException, (_, constants.ERR_FS_NOT_DIRECTORY):
+ except SubversionException, (_, errors.ERR_FS_NOT_DIRECTORY):
pass
finally:
pb.finished()
=== modified file 'revids.py'
--- a/revids.py 2008-06-05 17:41:24 +0000
+++ b/revids.py 2008-06-05 18:08:34 +0000
@@ -23,7 +23,7 @@
from bzrlib.plugins.svn import core
from bzrlib.plugins.svn.core import SubversionException
from bzrlib.plugins.svn.cache import CacheTable
-from bzrlib.plugins.svn.errors import InvalidPropertyValue
+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)
from bzrlib.plugins.svn.mapping3 import BzrSvnMappingv3FileProps
@@ -38,7 +38,7 @@
try:
(bzr_revno, revid) = mapping.get_revision_id(path, revprops, fileprops)
except SubversionException, (_, num):
- if num == constants.ERR_FS_NO_SUCH_REVISION:
+ if num == ERR_FS_NO_SUCH_REVISION:
raise NoSuchRevision(path, revnum)
raise
@@ -85,7 +85,7 @@
revids.add((parse_revid_property(line), scheme))
except InvalidPropertyValue, ie:
mutter(str(ie))
- except SubversionException, (_, constants.ERR_FS_NOT_DIRECTORY):
+ except SubversionException, (_, ERR_FS_NOT_DIRECTORY):
continue
# If there are any new entries that are not yet in the cache,
=== modified file 'tests/__init__.py'
--- a/tests/__init__.py 2008-06-05 17:05:57 +0000
+++ b/tests/__init__.py 2008-06-05 18:08:34 +0000
@@ -29,7 +29,7 @@
from bzrlib.trace import mutter
from bzrlib.workingtree import WorkingTree
-from bzrlib.plugins.svn import constants, repos, wc, client, ra
+from bzrlib.plugins.svn import repos, wc, client, ra, properties
class TestCaseWithSubversionRepository(TestCaseInTempDir):
"""A test case that provides the ability to build Subversion
@@ -149,9 +149,9 @@
ret = {}
def rcvr(orig_paths, rev, revprops):
ret[rev] = (orig_paths,
- revprops.get(constants.PROP_REVISION_AUTHOR),
- revprops.get(constants.PROP_REVISION_DATE),
- revprops.get(constants.PROP_REVISION_LOG))
+ revprops.get(properties.PROP_REVISION_AUTHOR),
+ revprops.get(properties.PROP_REVISION_DATE),
+ revprops.get(properties.PROP_REVISION_LOG))
if stop_revnum == -1:
stop_revnum = ra.get_latest_revnum()
ra.get_log(rcvr, None, start_revnum, stop_revnum, 0, True, True)
=== modified file 'tests/test_errors.py'
--- a/tests/test_errors.py 2008-06-04 18:56:53 +0000
+++ b/tests/test_errors.py 2008-06-05 18:08:34 +0000
@@ -19,10 +19,8 @@
UnexpectedEndOfContainerError)
from bzrlib.tests import TestCase
-from bzrlib.plugins.svn import constants
from bzrlib.plugins.svn.core import SubversionException
-from bzrlib.plugins.svn.errors import (convert_svn_error, convert_error, InvalidPropertyValue,
- InvalidSvnBranchPath, NotSvnBranchPath)
+from bzrlib.plugins.svn.errors import *
class TestConvertError(TestCase):
@@ -36,7 +34,7 @@
def test_decorator_known(self):
@convert_svn_error
def test_throws_svn():
- raise SubversionException("Connection closed", constants.ERR_RA_SVN_CONNECTION_CLOSED)
+ raise SubversionException("Connection closed", ERR_RA_SVN_CONNECTION_CLOSED)
self.assertRaises(ConnectionReset, test_throws_svn)
@@ -49,25 +47,25 @@
SubversionException)
def test_convert_malformed(self):
- self.assertIsInstance(convert_error(SubversionException("foo", constants.ERR_RA_SVN_MALFORMED_DATA)), TransportError)
+ self.assertIsInstance(convert_error(SubversionException("foo", ERR_RA_SVN_MALFORMED_DATA)), TransportError)
def test_convert_error_reset(self):
- self.assertIsInstance(convert_error(SubversionException("Connection closed", constants.ERR_RA_SVN_CONNECTION_CLOSED)), ConnectionReset)
+ self.assertIsInstance(convert_error(SubversionException("Connection closed", ERR_RA_SVN_CONNECTION_CLOSED)), ConnectionReset)
def test_convert_error_lock(self):
- self.assertIsInstance(convert_error(SubversionException("Working copy locked", constants.ERR_WC_LOCKED)), LockError)
+ self.assertIsInstance(convert_error(SubversionException("Working copy locked", ERR_WC_LOCKED)), LockError)
def test_convert_perm_denied(self):
- self.assertIsInstance(convert_error(SubversionException("Permission Denied", constants.ERR_RA_NOT_AUTHORIZED)), PermissionDenied)
+ self.assertIsInstance(convert_error(SubversionException("Permission Denied", ERR_RA_NOT_AUTHORIZED)), PermissionDenied)
def test_convert_unexpected_end(self):
- self.assertIsInstance(convert_error(SubversionException("Unexpected end of stream", constants.ERR_INCOMPLETE_DATA)), UnexpectedEndOfContainerError)
+ self.assertIsInstance(convert_error(SubversionException("Unexpected end of stream", ERR_INCOMPLETE_DATA)), UnexpectedEndOfContainerError)
def test_convert_unknown_hostname(self):
- self.assertIsInstance(convert_error(SubversionException("Unknown hostname 'bla'", constants.ERR_UNKNOWN_HOSTNAME)), ConnectionError)
+ self.assertIsInstance(convert_error(SubversionException("Unknown hostname 'bla'", ERR_UNKNOWN_HOSTNAME)), ConnectionError)
def test_not_implemented(self):
- self.assertIsInstance(convert_error(SubversionException("Remote server doesn't support ...", constants.ERR_RA_NOT_IMPLEMENTED)), NotImplementedError)
+ self.assertIsInstance(convert_error(SubversionException("Remote server doesn't support ...", ERR_RA_NOT_IMPLEMENTED)), NotImplementedError)
def test_decorator_nothrow(self):
@convert_svn_error
=== modified file 'transport.py'
--- a/transport.py 2008-06-05 17:34:37 +0000
+++ b/transport.py 2008-06-05 18:08:34 +0000
@@ -21,14 +21,11 @@
from bzrlib.trace import mutter
from bzrlib.transport import Transport
-from core import SubversionException
-from auth import create_auth_baton
-import ra
-import core
-import constants
+from bzrlib.plugins.svn.core import SubversionException
+from bzrlib.plugins.svn.auth import create_auth_baton
-from bzrlib.plugins.svn import properties
-from bzrlib.plugins.svn.errors import convert_svn_error, NoSvnRepositoryPresent
+from bzrlib.plugins.svn import core, properties, ra
+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
import urlparse
import urllib
@@ -100,9 +97,9 @@
auth=create_auth_baton(url))
# FIXME: Callbacks
except SubversionException, (_, num):
- if num in (constants.ERR_RA_SVN_REPOS_NOT_FOUND,):
+ if num in (ERR_RA_SVN_REPOS_NOT_FOUND,):
raise NoSvnRepositoryPresent(url=url)
- if num == constants.ERR_BAD_URL:
+ if num == ERR_BAD_URL:
raise InvalidURL(url)
raise
@@ -343,7 +340,7 @@
try:
(dirents, _, _) = self.get_dir(relpath, self.get_latest_revnum())
except SubversionException, (msg, num):
- if num == constants.ERR_FS_NOT_DIRECTORY:
+ if num == ERR_FS_NOT_DIRECTORY:
raise NoSuchFile(relpath)
raise
return dirents.keys()
=== modified file 'tree.py'
--- a/tree.py 2008-06-05 17:34:37 +0000
+++ b/tree.py 2008-06-05 18:08:34 +0000
@@ -29,7 +29,7 @@
import urllib
from bzrlib.plugins.svn.delta import apply_txdelta_handler
-from bzrlib.plugins.svn import core, constants, errors, wc, properties
+from bzrlib.plugins.svn import core, errors, wc, properties
def parse_externals_description(base_url, val):
"""Parse an svn:externals property value.
=== modified file 'workingtree.py'
--- a/workingtree.py 2008-06-05 17:34:37 +0000
+++ b/workingtree.py 2008-06-05 18:08:34 +0000
@@ -31,11 +31,11 @@
from bzrlib.transport.local import LocalTransport
from bzrlib.workingtree import WorkingTree, WorkingTreeFormat
-from bzrlib.plugins.svn import constants, properties
+from bzrlib.plugins.svn import properties
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 NoSvnRepositoryPresent
+from bzrlib.plugins.svn.errors import NoSvnRepositoryPresent, ERR_FS_TXN_OUT_OF_DATE, ERR_ENTRY_EXISTS, ERR_WC_PATH_NOT_FOUND, ERR_WC_NOT_DIRECTORY, ERR_WC_UNSUPPORTED_FORMAT
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)
@@ -474,9 +474,9 @@
if ids is not None:
self._change_fileid_mapping(ids.next(), f, adm)
except SubversionException, (_, num):
- if num == constants.ERR_ENTRY_EXISTS:
+ if num == ERR_ENTRY_EXISTS:
continue
- elif num == constants.ERR_WC_PATH_NOT_FOUND:
+ elif num == ERR_WC_PATH_NOT_FOUND:
raise NoSuchFile(path=f)
raise
finally:
@@ -697,7 +697,7 @@
# Open related remote repository + branch
try:
adm = wc.WorkingCopy(None, self.local_path)
- except SubversionException, (msg, constants.ERR_WC_UNSUPPORTED_FORMAT):
+ except SubversionException, (msg, ERR_WC_UNSUPPORTED_FORMAT):
raise UnsupportedFormatError(msg, kind='workingtree')
try:
self.svn_url = adm.entry(self.local_path, True).url
@@ -763,7 +763,7 @@
branch = SvnBranch(self.remote_transport.base, repos,
self.remote_bzrdir.branch_path)
except SubversionException, (_, num):
- if num == constants.ERR_WC_NOT_DIRECTORY:
+ if num == ERR_WC_NOT_DIRECTORY:
raise NotBranchError(path=self.base)
raise
More information about the bazaar-commits
mailing list