Mercurial > hgsubversion
diff hgsubversion/stupid.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 | 8410a978c650 |
| children | ae572c9be4e6 |
line wrap: on
line diff
--- a/hgsubversion/stupid.py +++ b/hgsubversion/stupid.py @@ -3,6 +3,7 @@ import errno import re from mercurial import context +from mercurial import error as hgerror from mercurial import node from mercurial import patch from mercurial import revlog @@ -633,14 +634,14 @@ def branches_in_paths(meta, tbdelta, pat def convert_rev(ui, meta, svn, r, tbdelta, firstrun): if svnwrap.subversion_version >= (1, 9, 0): - raise hgutil.Abort( + raise hgerror.Abort( "hgsubversion doesn't support stupid mode with Subversion 1.9." ' Please email hgsubversion@googlegroups.com and let us know you' ' saw this, otherwise we may remove stupid mode entirely.') # this server fails at replay if meta.filemap: - raise hgutil.Abort('filemaps currently unsupported with stupid replay.') + raise hgerror.Abort('filemaps currently unsupported with stupid replay.') branches = branches_in_paths(meta, tbdelta, r.paths, r.revnum, svn.checkpath, svn.list_files, firstrun)