Mercurial > hgsubversion
diff hgsubversion/__init__.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 | 601eaa89ca98 |
| children | ae572c9be4e6 |
line wrap: on
line diff
--- a/hgsubversion/__init__.py +++ b/hgsubversion/__init__.py @@ -28,6 +28,7 @@ try: except ImportError: # We only *use* the exchange module in hg 3.2+, so this is safe pass +from mercurial import error as hgerror from mercurial import extensions from mercurial import help from mercurial import hg @@ -349,7 +350,7 @@ def _templatehelper(ctx, kw): elif kw == 'svnrev': return convertinfo[40:].rsplit('@', 1)[-1] else: - raise hgutil.Abort('unrecognized hgsubversion keyword %s' % kw) + raise hgerror.Abort('unrecognized hgsubversion keyword %s' % kw) @templatekeyword('svnrev') def svnrevkw(**args):