Mercurial > hgsubversion
diff hgsubversion/replay.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/replay.py +++ b/hgsubversion/replay.py @@ -1,6 +1,7 @@ import errno import traceback +from mercurial import error as hgerror from mercurial import revlog from mercurial import node from mercurial import context @@ -93,7 +94,7 @@ def _convert_rev(ui, meta, svn, r, tbdel for f in files_to_commit: if not meta.is_path_valid(f): if failoninvalid: - raise hgutil.Abort('file %s should not be in commit list' % f) + raise hgerror.Abort('file %s should not be in commit list' % f) continue p, b = meta.split_branch_path(f)[:2] if b not in branch_batches: