Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
templater: attach hint to input-type error of runfilter()
authorYuya Nishihara <yuya@tcha.org>
Tue, 20 Mar 2018 22:57:36 +0900
changeset 37226 920589f52be9
parent 37225 e70a90a72b80
child 37227 9bcf096a2da2
templater: attach hint to input-type error of runfilter() Tests will be added by the next patch.
mercurial/templateutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/templateutil.py	Sun Mar 18 15:58:22 2018 +0900
+++ b/mercurial/templateutil.py	Tue Mar 20 22:57:36 2018 +0900
@@ -423,14 +423,17 @@
         thing = unwrapastype(thing, getattr(filt, '_intype', None))
         return filt(thing)
     except (ValueError, AttributeError, TypeError):
-        sym = findsymbolicname(arg)
-        if sym:
-            msg = (_("template filter '%s' is not compatible with keyword '%s'")
-                   % (pycompat.sysbytes(filt.__name__), sym))
-        else:
-            msg = (_("incompatible use of template filter '%s'")
-                   % pycompat.sysbytes(filt.__name__))
-        raise error.Abort(msg)
+        raise error.Abort(_formatfiltererror(arg, filt))
+    except error.ParseError as e:
+        raise error.ParseError(bytes(e), hint=_formatfiltererror(arg, filt))
+
+def _formatfiltererror(arg, filt):
+    fn = pycompat.sysbytes(filt.__name__)
+    sym = findsymbolicname(arg)
+    if not sym:
+        return _("incompatible use of template filter '%s'") % fn
+    return (_("template filter '%s' is not compatible with keyword '%s'")
+            % (fn, sym))
 
 def runmap(context, mapping, data):
     darg, targ = data
Mercurial