Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
parser: verify excessive number of args excluding kwargs in buildargsdict()
authorYuya Nishihara <yuya@tcha.org>
Sat, 08 Apr 2017 20:07:37 +0900
changeset 31920 a98540ea1e42
parent 31919 2bf73e351eb1
child 31921 2156934b7917
parser: verify excessive number of args excluding kwargs in buildargsdict() This makes the next patch slightly simpler. We don't need to check the excessive number of keyword arguments since unknown and duplicated kwargs are rejected.
mercurial/parser.py file | annotate | diff | comparison | revisions
tests/test-revset.t file | annotate | diff | comparison | revisions 
--- a/mercurial/parser.py	Mon Apr 10 16:50:23 2017 +0200
+++ b/mercurial/parser.py	Sat Apr 08 20:07:37 2017 +0900
@@ -135,8 +135,9 @@
         raise error.ParseError(_("%(func)s takes at least %(nargs)d positional "
                                  "arguments")
                                % {'func': funcname, 'nargs': len(poskeys)})
-    if not varkey and len(trees) > len(poskeys) + len(keys):
-        raise error.ParseError(_("%(func)s takes at most %(nargs)d arguments")
+    if not varkey and kwstart > len(poskeys) + len(keys):
+        raise error.ParseError(_("%(func)s takes at most %(nargs)d positional "
+                                 "arguments")
                                % {'func': funcname,
                                   'nargs': len(poskeys) + len(keys)})
     args = {}
--- a/tests/test-revset.t	Mon Apr 10 16:50:23 2017 +0200
+++ b/tests/test-revset.t	Sat Apr 08 20:07:37 2017 +0900
@@ -454,7 +454,7 @@
   0
 
   $ log 'extra(branch, a, b)'
-  hg: parse error: extra takes at most 2 arguments
+  hg: parse error: extra takes at most 2 positional arguments
   [255]
   $ log 'extra(a, label=b)'
   hg: parse error: extra got multiple values for keyword argument 'label'
mercurial