Mercurial > public > mercurial-scm > hg-stable
diff mercurial/templater.py @ 35421:a51541681b8d
merge with stable
author | Augie Fackler <augie@google.com> |
---|---|
date | Thu, 14 Dec 2017 16:01:28 -0500 |
parents | 073bc922d349 fdd09d87635b |
children | d6cfa722b044 |
line wrap: on
line diff
--- a/mercurial/templater.py Thu Dec 14 20:18:15 2017 +0000 +++ b/mercurial/templater.py Thu Dec 14 16:01:28 2017 -0500 @@ -918,7 +918,7 @@ """Return the max of an iterable""" if len(args) != 1: # i18n: "max" is a keyword - raise error.ParseError(_("max expects one arguments")) + raise error.ParseError(_("max expects one argument")) iterable = evalfuncarg(context, mapping, args[0]) try: @@ -933,7 +933,7 @@ """Return the min of an iterable""" if len(args) != 1: # i18n: "min" is a keyword - raise error.ParseError(_("min expects one arguments")) + raise error.ParseError(_("min expects one argument")) iterable = evalfuncarg(context, mapping, args[0]) try: @@ -958,7 +958,7 @@ """Compute obsfate related information based on markers (EXPERIMENTAL)""" if len(args) != 1: # i18n: "obsfateoperations" is a keyword - raise error.ParseError(_("obsfateoperations expects one arguments")) + raise error.ParseError(_("obsfateoperations expects one argument")) markers = evalfuncarg(context, mapping, args[0]) @@ -975,7 +975,7 @@ """Compute obsfate related information based on markers (EXPERIMENTAL)""" if len(args) != 1: # i18n: "obsfatedate" is a keyword - raise error.ParseError(_("obsfatedate expects one arguments")) + raise error.ParseError(_("obsfatedate expects one argument")) markers = evalfuncarg(context, mapping, args[0]) @@ -992,7 +992,7 @@ """Compute obsfate related information based on markers (EXPERIMENTAL)""" if len(args) != 1: # i18n: "obsfateusers" is a keyword - raise error.ParseError(_("obsfateusers expects one arguments")) + raise error.ParseError(_("obsfateusers expects one argument")) markers = evalfuncarg(context, mapping, args[0])