changeset 31121:8346b2f09e79

color: add the definition of '--color' in core If we want to be able to move the initialisation in core, we need core to be aware of that '--color' flag at all time. So we now have the definition in core. That flag is currently unprocessed without the extensions (will be fixed soon). In addition the default value for this flag in core is 'never'. Enabling the extensions change that default value to 'auto'.
author Pierre-Yves David <pierre-yves.david@ens-lyon.org>
date Tue, 21 Feb 2017 18:09:21 +0100
parents c1997c5d1ae3
children 45be7590301d
files hgext/color.py mercurial/commands.py tests/test-completion.t tests/test-extension.t tests/test-gendoc-ro.t tests/test-help.t
diffstat 6 files changed, 39 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/color.py	Tue Feb 21 17:51:43 2017 +0100
+++ b/hgext/color.py	Tue Feb 21 18:09:21 2017 +0100
@@ -198,12 +198,13 @@
     extensions.wrapfunction(dispatch, '_runcommand', colorcmd)
 
 def extsetup(ui):
-    commands.globalopts.append(
-        ('', 'color', 'auto',
-         # i18n: 'always', 'auto', 'never', and 'debug' are keywords
-         # and should not be translated
-         _("when to colorize (boolean, always, auto, never, or debug)"),
-         _('TYPE')))
+    # change default color config
+    for idx, entry in enumerate(commands.globalopts):
+        if entry[1] == 'color':
+            patch = ('auto', entry[3].replace(' (EXPERIMENTAL)', ''))
+            new = entry[:2] + patch + entry[4:]
+            commands.globalopts[idx] = new
+            break
 
 @command('debugcolor',
         [('', 'style', None, _('show all configured styles'))],
--- a/mercurial/commands.py	Tue Feb 21 17:51:43 2017 +0100
+++ b/mercurial/commands.py	Tue Feb 21 18:09:21 2017 +0100
@@ -77,6 +77,12 @@
      _('do not prompt, automatically pick the first choice for all prompts')),
     ('q', 'quiet', None, _('suppress output')),
     ('v', 'verbose', None, _('enable additional output')),
+    ('', 'color', 'never',
+     # i18n: 'always', 'auto', 'never', and 'debug' are keywords
+     # and should not be translated
+     _("when to colorize (boolean, always, auto, never, or debug)"
+       " (EXPERIMENTAL)"),
+     _('TYPE')),
     ('', 'config', [],
      _('set/override config option (use \'section.name=value\')'),
      _('CONFIG')),
--- a/tests/test-completion.t	Tue Feb 21 17:51:43 2017 +0100
+++ b/tests/test-completion.t	Tue Feb 21 18:09:21 2017 +0100
@@ -129,6 +129,7 @@
 
 Show the global options
   $ hg debugcomplete --options | sort
+  --color
   --config
   --cwd
   --debug
@@ -158,6 +159,7 @@
   --address
   --certificate
   --cmdserver
+  --color
   --config
   --cwd
   --daemon
--- a/tests/test-extension.t	Tue Feb 21 17:51:43 2017 +0100
+++ b/tests/test-extension.t	Tue Feb 21 18:09:21 2017 +0100
@@ -532,6 +532,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -569,6 +571,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -849,6 +853,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -884,6 +890,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -957,6 +965,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -991,6 +1001,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
--- a/tests/test-gendoc-ro.t	Tue Feb 21 17:51:43 2017 +0100
+++ b/tests/test-gendoc-ro.t	Tue Feb 21 18:09:21 2017 +0100
@@ -5,5 +5,5 @@
 until the localization is corrected.
   $ $TESTDIR/check-gendoc ro
   checking for parse errors
-  gendoc.txt:55: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
-  gendoc.txt:55: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
+  gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
+  gendoc.txt:58: (WARNING/2) Inline interpreted text or phrase reference start-string without end-string.
--- a/tests/test-help.t	Tue Feb 21 17:51:43 2017 +0100
+++ b/tests/test-help.t	Tue Feb 21 18:09:21 2017 +0100
@@ -316,6 +316,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -414,6 +416,8 @@
                           all prompts
    -q --quiet             suppress output
    -v --verbose           enable additional output
+      --color TYPE        when to colorize (boolean, always, auto, never, or
+                          debug) (EXPERIMENTAL) (default: never)
       --config CONFIG [+] set/override config option (use 'section.name=value')
       --debug             enable debugging output
       --debugger          start debugger
@@ -2516,6 +2520,9 @@
   <td>--verbose</td>
   <td>enable additional output</td></tr>
   <tr><td></td>
+  <td>--color TYPE</td>
+  <td>when to colorize (boolean, always, auto, never, or debug) (EXPERIMENTAL) (default: never)</td></tr>
+  <tr><td></td>
   <td>--config CONFIG [+]</td>
   <td>set/override config option (use 'section.name=value')</td></tr>
   <tr><td></td>
@@ -2714,6 +2721,9 @@
   <td>--verbose</td>
   <td>enable additional output</td></tr>
   <tr><td></td>
+  <td>--color TYPE</td>
+  <td>when to colorize (boolean, always, auto, never, or debug) (EXPERIMENTAL) (default: never)</td></tr>
+  <tr><td></td>
   <td>--config CONFIG [+]</td>
   <td>set/override config option (use 'section.name=value')</td></tr>
   <tr><td></td>