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.
templater: fix shortest() to evaluate int argument and handle error
authorYuya Nishihara <yuya@tcha.org>
Sun, 14 Feb 2016 13:09:17 +0900
changeset 28346 542d200bd261
parent 28345 d81437c91a26
child 28347 ccb33e965150
templater: fix shortest() to evaluate int argument and handle error
mercurial/templater.py file | annotate | diff | comparison | revisions
tests/test-command-template.t file | annotate | diff | comparison | revisions 
--- a/mercurial/templater.py	Sun Feb 14 13:05:09 2016 +0900
+++ b/mercurial/templater.py	Sun Feb 14 13:09:17 2016 +0900
@@ -621,7 +621,9 @@
 
     minlength = 4
     if len(args) > 1:
-        minlength = int(args[1][1])
+        minlength = evalinteger(context, mapping, args[1],
+                                # i18n: "shortest" is a keyword
+                                _("shortest() expects an integer minlength"))
 
     cl = mapping['ctx']._repo.changelog
     def isvalid(test):
--- a/tests/test-command-template.t	Sun Feb 14 13:05:09 2016 +0900
+++ b/tests/test-command-template.t	Sun Feb 14 13:09:17 2016 +0900
@@ -3219,6 +3219,12 @@
   $ hg log --template '{node|shortest}\n' -l1
   e777
 
+  $ hg log -r 0 -T '{shortest(node, "1{"0"}")}\n'
+  f7769ec2ab
+  $ hg log -r 0 -T '{shortest(node, "not an int")}\n'
+  hg: parse error: shortest() expects an integer minlength
+  [255]
+
 Test pad function
 
   $ hg log --template '{pad(rev, 20)} {author|user}\n'
mercurial