Include initial use of colorama

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 51 matching lines @@
 import urlparse
 import urllib
 
 import breakpad  # pylint: disable=W0611
 
 import fix_encoding
 import gclient_scm
 import gclient_utils
 from third_party.repo.progress import Progress
 import subprocess2
+from third_party import colorama
+# Import shortcut.
+from third_party.colorama import Fore
 
 
 def attr(attribute, data):
   """Sets an attribute on a function."""
   def hook(fn):
     setattr(fn, attribute, data)
     return fn
   return hook
 
 
@@ skipping 1394 matching lines @@
   parser.format_epilog = lambda _: parser.epilog or ''
   return parser
 
 
 def Main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
   if sys.hexversion < 0x02050000:
     print >> sys.stderr, (
         '\nYour python version is unsupported, please upgrade.\n')
+  colorama.init()
   try:
     # Make stdout auto-flush so buildbot doesn't kill us during lengthy
     # operations. Python as a strong tendency to buffer sys.stdout.
     sys.stdout = gclient_utils.MakeFileAutoFlush(sys.stdout)
     # Make stdout annotated with the thread ids.
     sys.stdout = gclient_utils.MakeFileAnnotated(sys.stdout)
     # Do it late so all commands are listed.
     # Unused variable 'usage'
     # pylint: disable=W0612
-    CMDhelp.usage = ('\n\nCommands are:\n' + '\n'.join([
-        '  %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip())
-        for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
+    def to_str(fn):
+      return (
+          '  %s%-10s%s' % (Fore.GREEN, fn[3:], Fore.RESET) +
+          ' %s' % Command(fn[3:]).__doc__.split('\n')[0].strip())
+    cmds = (
+        to_str(fn) for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')
+    )
+    CMDhelp.usage = '\n\nCommands are:\n' + '\n'.join(cmds)
     parser = Parser()
     if argv:
       command = Command(argv[0])
       if command:
         # 'fix' the usage and the description now that we know the subcommand.
         GenUsage(parser, argv[0])
         return command(parser, argv[1:])
     # Not a known command. Default to help.
     GenUsage(parser, 'help')
     return CMDhelp(parser, argv)
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: