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'.

hgext/color.py

@@ -198,12 +198,13 @@ def uisetup(ui):
     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'))],

mercurial/commands.py

@@ -77,6 +77,12 @@ globalopts = [
      _('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')),

tests/test-completion.t

@@ -129,6 +129,7 @@ Show the alias of a debug command if there are no other candidates
 
 Show the global options
   $ hg debugcomplete --options | sort
+  --color
   --config
   --cwd
   --debug
@@ -158,6 +159,7 @@ Show the options for the "serve" command
   --address
   --certificate
   --cmdserver
+  --color
   --config
   --cwd
   --daemon

tests/test-extension.t

@@ -532,6 +532,8 @@ hide outer repo
                           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 @@ hide outer repo
                           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 @@ extension help itself
                           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 @@ Make sure that single '-v' option shows help and built-ins only for 'dodo' comma
                           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 @@ help options '-v' and '-v -e' should be equivalent
                           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 @@ help options '-v' and '-v -e' should be equivalent
                           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

tests/test-gendoc-ro.t

@@ -5,5 +5,5 @@ moving pager to core. These two warnings about references are expected
 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.

tests/test-help.t

@@ -316,6 +316,8 @@ Test short command list with verbose option
                           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 @@ Verbose help for add
                           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 @@ Dish up an empty repo; serve it cold.
   <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 @@ Dish up an empty repo; serve it cold.
   <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>