Mercurial > hg-stable

changeset 26370:44cc9f63a2f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
help: include parens in DEPRECATED/EXPERIMENTAL keywords In some languages that have no caps, "DEPRECATED" and "deprecated" can be translated to the same byte sequence. So it is too wild to exclude messages by _("DEPRECATED").
author Yuya Nishihara <yuya@tcha.org>
date Sat, 26 Sep 2015 11:38:39 +0900
parents 4799b5c4aaf4
children 51b309ce6c7d
files hgext/convert/__init__.py mercurial/help.py tests/test-help.t
diffstat 3 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/__init__.py	Sat Sep 26 11:25:38 2015 +0900
+++ b/hgext/convert/__init__.py	Sat Sep 26 11:38:39 2015 +0900
@@ -25,7 +25,7 @@
 
 @command('convert',
     [('', 'authors', '',
-      _('username mapping filename (DEPRECATED, use --authormap instead)'),
+      _('username mapping filename (DEPRECATED) (use --authormap instead)'),
       _('FILE')),
     ('s', 'source-type', '', _('source repository type'), _('TYPE')),
     ('d', 'dest-type', '', _('destination repository type'), _('TYPE')),
--- a/mercurial/help.py	Sat Sep 26 11:25:38 2015 +0900
+++ b/mercurial/help.py	Sat Sep 26 11:38:39 2015 +0900
@@ -15,10 +15,12 @@
 import hgweb.webcommands as webcommands
 
 _exclkeywords = [
-    "DEPRECATED",
-    "EXPERIMENTAL",
-    _("DEPRECATED"),
-    _("EXPERIMENTAL"),
+    "(DEPRECATED)",
+    "(EXPERIMENTAL)",
+    # i18n: "(DEPRECATED)" is a keyword, must be translated consistently
+    _("(DEPRECATED)"),
+    # i18n: "(EXPERIMENTAL)" is a keyword, must be translated consistently
+    _("(EXPERIMENTAL)"),
     ]
 
 def listexts(header, exts, indent=1, showdeprecated=False):
@@ -339,7 +341,7 @@
             if not ui.debugflag and f.startswith("debug") and name != "debug":
                 continue
             doc = e[0].__doc__
-            if doc and 'DEPRECATED' in doc and not ui.verbose:
+            if doc and '(DEPRECATED)' in doc and not ui.verbose:
                 continue
             doc = gettext(doc)
             if not doc:
--- a/tests/test-help.t	Sat Sep 26 11:25:38 2015 +0900
+++ b/tests/test-help.t	Sat Sep 26 11:38:39 2015 +0900
@@ -646,8 +646,8 @@
   >     ('', 'newline', '', 'line1\nline2')],
   >     'hg nohelp',
   >     norepo=True)
-  > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')])
-  > @command('debugoptEXP', [('', 'eopt', None, 'option is EXPERIMENTAL')])
+  > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')])
+  > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')])
   > def nohelp(ui, *args, **kwargs):
   >     pass
   > 
@@ -868,9 +868,9 @@
 
 test deprecated and experimental options is shown with -v
   $ hg help -v debugoptDEP | grep dopt
-    --dopt option is DEPRECATED
+    --dopt option is (DEPRECATED)
   $ hg help -v debugoptEXP | grep eopt
-    --eopt option is EXPERIMENTAL
+    --eopt option is (EXPERIMENTAL)
 
 #if gettext
 test deprecated option is hidden with translation with untranslated description