Patchwork templater: fix "one arguments"

login
register
mail settings
Submitter Anton Shestakov
Date Dec. 12, 2017, 9:08 a.m.
Message ID <c77b2387bd202d65f410.1513069733@neuro>
Download mbox | patch
Permalink /patch/26229/
State Accepted
Headers show

Comments

Anton Shestakov - Dec. 12, 2017, 9:08 a.m.
# HG changeset patch
# User Anton Shestakov <av6@dwimlabs.net>
# Date 1513067366 -28800
#      Tue Dec 12 16:29:26 2017 +0800
# Node ID c77b2387bd202d65f410392f472a40e9a6668f95
# Parent  cb0df5a3affba6e8f1789de337230cbeecda9c5a
# EXP-Topic hgweb-more-info
templater: fix "one arguments"
Yuya Nishihara - Dec. 12, 2017, 12:54 p.m.
On Tue, 12 Dec 2017 17:08:53 +0800, Anton Shestakov wrote:
> # HG changeset patch
> # User Anton Shestakov <av6@dwimlabs.net>
> # Date 1513067366 -28800
> #      Tue Dec 12 16:29:26 2017 +0800
> # Node ID c77b2387bd202d65f410392f472a40e9a6668f95
> # Parent  cb0df5a3affba6e8f1789de337230cbeecda9c5a
> # EXP-Topic hgweb-more-info
> templater: fix "one arguments"

Queued for stable, thanks.

Patch

diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -918,7 +918,7 @@  def max_(context, mapping, args, **kwarg
     """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 @@  def min_(context, mapping, args, **kwarg
     """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 @@  def obsfateoperations(context, mapping, 
     """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 @@  def obsfatedate(context, mapping, args):
     """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 @@  def obsfateusers(context, mapping, args)
     """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])