diff hgsubversion/svnrepo.py @ 1555:cff81f35b31e

cleanup: reference Abort from mercurial.error instead of mercurial.util It's been there since hg 1.7 or so, which lets us avoid any need for compat shims.
author Augie Fackler <raf@durin42.com>
date Sat, 24 Mar 2018 16:39:30 -0400
parents 27c4daf50520
children ae572c9be4e6
line wrap: on
line diff
--- a/hgsubversion/svnrepo.py
+++ b/hgsubversion/svnrepo.py
@@ -133,7 +133,7 @@ class svnremoterepo(peerrepository):
         if path is None:
             path = self.ui.config('paths', 'default')
         if not path:
-            raise hgutil.Abort('no Subversion URL specified. Expect '
+            raise error.Abort('no Subversion URL specified. Expect '
                                '[path] default= or [path] default-push= '
                                'SVN URL entries in hgrc.')
         self.path = path
@@ -179,7 +179,7 @@ class svnremoterepo(peerrepository):
             return svnwrap.SubversionRepo(auth[0], auth[1], auth[2], password_stores=self.password_stores)
         except svnwrap.SubversionConnectionException, e:
             self.ui.traceback()
-            raise hgutil.Abort(e)
+            raise error.Abort(e)
 
     @property
     def ui(self):
@@ -199,7 +199,7 @@ class svnremoterepo(peerrepository):
         Whenever this function is hit, we abort. The traceback is useful for
         figuring out where to intercept the functionality.
         """
-        raise hgutil.Abort('command unavailable for Subversion repositories')
+        raise error.Abort('command unavailable for Subversion repositories')
 
     def pushkey(self, namespace, key, old, new):
         return False
@@ -251,7 +251,7 @@ def instance(ui, url, create):
             ui.note('(falling back to Subversion support)\n')
 
     if create:
-        raise hgutil.Abort('cannot create new remote Subversion repository')
+        raise error.Abort('cannot create new remote Subversion repository')
 
     svnwrap.prompt_callback(SubversionPrompt(ui))
     return svnremoterepo(ui, url)