Merge 0.4.

[jelmer/subvertpy.git] / errors.py

diff --git a/errors.py b/errors.py
index 3f736c6f967fbcdac72092079721871428784715..83c4ea47b3b88ba6ce0a0374d3e36ff3f40a0fd9 100644 (file)
--- a/errors.py
+++ b/errors.py
@@ -18,10 +18,11 @@
 from bzrlib.errors import (BzrError, ConnectionError, ConnectionReset, 
                            LockError, NotBranchError, PermissionDenied, 
                            DependencyNotPresent, NoRepositoryPresent,
-                           TransportError, UnexpectedEndOfContainerError)
+                           TransportError, UnexpectedEndOfContainerError,
+                           RedirectRequested)
 
 import urllib
-import svn.core
+from bzrlib.plugins.svn import core
 
 
 class InvalidExternalsDescription(BzrError):
@@ -44,6 +45,7 @@ ERR_RA_ILLEGAL_URL = 170000
 ERR_RA_LOCAL_REPOS_OPEN_FAILED = 180001
 ERR_BAD_URL = 125002
 ERR_RA_DAV_REQUEST_FAILED = 175002
+ERR_RA_DAV_PATH_NOT_FOUND = 175007
 ERR_FS_NOT_DIRECTORY = 160016
 ERR_FS_NOT_FOUND = 160013
 ERR_FS_ALREADY_EXISTS = 160020
@@ -53,7 +55,9 @@ ERR_ENTRY_EXISTS = 150002
 ERR_WC_PATH_NOT_FOUND = 155010
 ERR_CANCELLED = 200015
 ERR_WC_UNSUPPORTED_FORMAT = 155021
-
+ERR_UNKNOWN_CAPABILITY = 200026
+ERR_AUTHN_NO_PROVIDER = 215001
+ERR_RA_DAV_RELOCATED = 175011
 
 
 class NotSvnBranchPath(NotBranchError):
@@ -128,7 +132,7 @@ def convert_svn_error(unbound):
     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__
@@ -136,11 +140,6 @@ def convert_svn_error(unbound):
     return convert
 
 
-class NoCheckoutSupport(BzrError):
-
-    _fmt = 'Subversion version too old for working tree support.'
-
-
 class LocalCommitsUnsupported(BzrError):
 
     _fmt = 'Local commits are not supported for lightweight Subversion checkouts.'