Show More
@@ -25,7 +25,7 b" testedwith = 'internal'" | |||||
25 |
|
25 | |||
26 | @command('convert', |
|
26 | @command('convert', | |
27 | [('', 'authors', '', |
|
27 | [('', 'authors', '', | |
28 |
_('username mapping filename (DEPRECATED |
|
28 | _('username mapping filename (DEPRECATED) (use --authormap instead)'), | |
29 | _('FILE')), |
|
29 | _('FILE')), | |
30 | ('s', 'source-type', '', _('source repository type'), _('TYPE')), |
|
30 | ('s', 'source-type', '', _('source repository type'), _('TYPE')), | |
31 | ('d', 'dest-type', '', _('destination repository type'), _('TYPE')), |
|
31 | ('d', 'dest-type', '', _('destination repository type'), _('TYPE')), |
@@ -15,10 +15,12 b' import cmdutil' | |||||
15 | import hgweb.webcommands as webcommands |
|
15 | import hgweb.webcommands as webcommands | |
16 |
|
16 | |||
17 | _exclkeywords = [ |
|
17 | _exclkeywords = [ | |
18 | "DEPRECATED", |
|
18 | "(DEPRECATED)", | |
19 | "EXPERIMENTAL", |
|
19 | "(EXPERIMENTAL)", | |
20 | _("DEPRECATED"), |
|
20 | # i18n: "(DEPRECATED)" is a keyword, must be translated consistently | |
21 |
_(" |
|
21 | _("(DEPRECATED)"), | |
|
22 | # i18n: "(EXPERIMENTAL)" is a keyword, must be translated consistently | |||
|
23 | _("(EXPERIMENTAL)"), | |||
22 | ] |
|
24 | ] | |
23 |
|
25 | |||
24 | def listexts(header, exts, indent=1, showdeprecated=False): |
|
26 | def listexts(header, exts, indent=1, showdeprecated=False): | |
@@ -339,7 +341,7 b' def help_(ui, name, unknowncmd=False, fu' | |||||
339 | if not ui.debugflag and f.startswith("debug") and name != "debug": |
|
341 | if not ui.debugflag and f.startswith("debug") and name != "debug": | |
340 | continue |
|
342 | continue | |
341 | doc = e[0].__doc__ |
|
343 | doc = e[0].__doc__ | |
342 | if doc and 'DEPRECATED' in doc and not ui.verbose: |
|
344 | if doc and '(DEPRECATED)' in doc and not ui.verbose: | |
343 | continue |
|
345 | continue | |
344 | doc = gettext(doc) |
|
346 | doc = gettext(doc) | |
345 | if not doc: |
|
347 | if not doc: |
@@ -646,8 +646,8 b' this is a section and erroring out weird' | |||||
646 | > ('', 'newline', '', 'line1\nline2')], |
|
646 | > ('', 'newline', '', 'line1\nline2')], | |
647 | > 'hg nohelp', |
|
647 | > 'hg nohelp', | |
648 | > norepo=True) |
|
648 | > norepo=True) | |
649 | > @command('debugoptDEP', [('', 'dopt', None, 'option is DEPRECATED')]) |
|
649 | > @command('debugoptDEP', [('', 'dopt', None, 'option is (DEPRECATED)')]) | |
650 | > @command('debugoptEXP', [('', 'eopt', None, 'option is EXPERIMENTAL')]) |
|
650 | > @command('debugoptEXP', [('', 'eopt', None, 'option is (EXPERIMENTAL)')]) | |
651 | > def nohelp(ui, *args, **kwargs): |
|
651 | > def nohelp(ui, *args, **kwargs): | |
652 | > pass |
|
652 | > pass | |
653 | > |
|
653 | > | |
@@ -868,9 +868,9 b' test deprecated and experimental options' | |||||
868 |
|
868 | |||
869 | test deprecated and experimental options is shown with -v |
|
869 | test deprecated and experimental options is shown with -v | |
870 | $ hg help -v debugoptDEP | grep dopt |
|
870 | $ hg help -v debugoptDEP | grep dopt | |
871 | --dopt option is DEPRECATED |
|
871 | --dopt option is (DEPRECATED) | |
872 | $ hg help -v debugoptEXP | grep eopt |
|
872 | $ hg help -v debugoptEXP | grep eopt | |
873 | --eopt option is EXPERIMENTAL |
|
873 | --eopt option is (EXPERIMENTAL) | |
874 |
|
874 | |||
875 | #if gettext |
|
875 | #if gettext | |
876 | test deprecated option is hidden with translation with untranslated description |
|
876 | test deprecated option is hidden with translation with untranslated description |
General Comments 0
You need to be logged in to leave comments.
Login now