From 38127671b52a8f92bc2a04686c77edbfa507eb69 Mon Sep 17 00:00:00 2001 From: Dan Villiom Podlaski Christiansen Date: Fri, 14 May 2010 14:21:25 +0200 Subject: [PATCH] svnwrap: use SubversionConnectionException instead of mercurial.util.Abort This makes svnwrap independent of Mercurial. --- hgsubversion/svnwrap/svn_swig_wrapper.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/hgsubversion/svnwrap/svn_swig_wrapper.py b/hgsubversion/svnwrap/svn_swig_wrapper.py index 56acd3ce9e..85856d419f 100644 --- a/hgsubversion/svnwrap/svn_swig_wrapper.py +++ b/hgsubversion/svnwrap/svn_swig_wrapper.py @@ -14,8 +14,6 @@ warnings.filterwarnings('ignore', module='svn.core', category=DeprecationWarning) -from mercurial import util as hgutil - required_bindings = (1, 5, 0) try: @@ -423,10 +421,11 @@ class SubversionRepo(object): self.pool) except core.SubversionException, e: if e.apr_err == core.SVN_ERR_FS_NOT_FOUND: - raise hgutil.Abort('%s not found at revision %d!' - % (self.subdir.rstrip('/'), stop)) + msg = ('%s not found at revision %d!' + % (self.subdir.rstrip('/'), stop)) + raise SubversionConnectionException(msg) elif e.apr_err == core.SVN_ERR_FS_NO_SUCH_REVISION: - raise hgutil.Abort(e.message) + raise SubversionConnectionException(e.message) else: raise