Mercurial > evolve

diff hgext3rd/topic/compat.py @ 6318:3e488afe62f5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
topic: use compat.InputError for conflicting CLI flags
author Anton Shestakov <av6@dwimlabs.net>
date Thu, 07 Apr 2022 20:02:45 +0300
parents 77ce98287dc2
children 0c780d972350
line wrap: on
line diff
--- a/hgext3rd/topic/compat.py	Fri Oct 07 20:32:14 2022 -0400
+++ b/hgext3rd/topic/compat.py	Thu Apr 07 20:02:45 2022 +0300
@@ -9,6 +9,7 @@
 
 from mercurial import (
     cmdutil,
+    error,
     extensions,
     pycompat,
     util,
@@ -49,3 +50,9 @@
                 return orig(repo, node, branch, bheads=bheads, opts=opts)
             return overridefn(_orig, repo, node, branch, bheads=bheads, tip=None, opts=opts)
         extensions.wrapfunction(cmdutil, 'commitstatus', _override)
+
+if util.safehasattr(error, 'InputError'):
+    InputError = error.InputError
+else:
+    # hg <= 5.6 (8d72e29ad1e0)
+    InputError = error.Abort