Patchwork [4,of,4] grammar: favor zero, one, two over ... or no

login
register
mail settings
Submitter timeless@mozdev.org
Date Dec. 7, 2015, 8:23 p.m.
Message ID <008a04a3d64ef3239a06.1449519830@waste.org>
Download mbox | patch
Permalink /patch/11912/
State Accepted
Headers show

Comments

timeless@mozdev.org - Dec. 7, 2015, 8:23 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1448911816 0
#      Mon Nov 30 19:30:16 2015 +0000
# Node ID 008a04a3d64ef3239a06a84c0251dfe537a8919e
# Parent  d400a9c4ec6cb3b07248e9287251c44809fe42ce
grammar: favor zero, one, two over ... or no
Pierre-Yves David - Dec. 9, 2015, 4:16 a.m.
On 12/07/2015 12:23 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1448911816 0
> #      Mon Nov 30 19:30:16 2015 +0000
> # Node ID 008a04a3d64ef3239a06a84c0251dfe537a8919e
> # Parent  d400a9c4ec6cb3b07248e9287251c44809fe42ce
> grammar: favor zero, one, two over ... or no

patch 1,3,4 are pushed.

Patch

diff --git a/mercurial/revset.py b/mercurial/revset.py
--- a/mercurial/revset.py
+++ b/mercurial/revset.py
@@ -1692,7 +1692,7 @@ 
 
     from . import hg # avoid start-up nasties
     # i18n: "remote" is a keyword
-    l = getargs(x, 0, 2, _("remote takes one, two or no arguments"))
+    l = getargs(x, 0, 2, _("remote takes zero, one, or two arguments"))
 
     q = '.'
     if len(l) > 0:
diff --git a/mercurial/templater.py b/mercurial/templater.py
--- a/mercurial/templater.py
+++ b/mercurial/templater.py
@@ -336,7 +336,7 @@ 
     specifying files to include or exclude."""
     if len(args) > 2:
         # i18n: "diff" is a keyword
-        raise error.ParseError(_("diff expects one, two or no arguments"))
+        raise error.ParseError(_("diff expects zero, one, or two arguments"))
 
     def getpatterns(i):
         if i < len(args):