Convert gclient to use subcommand.py

git_cl.py

Index: git_cl.py
diff --git a/git_cl.py b/git_cl.py
index eb6594dc48b89ed1d45343aeb186f1a4d603b0c5..dc351a2123a9f1bb29c2c7cf95806e7b4dcf7d1e 100755
--- a/git_cl.py
+++ b/git_cl.py
@@ -1077,6 +1077,8 @@ def CMDstatus(parser, args):
   parser.add_option('-f', '--fast', action='store_true',
                     help='Do not retrieve review status')
   (options, args) = parser.parse_args(args)
+  if args:
+    parser.error('Unsupported args: %s' % args)
 
   if options.field:
     cl = Changelist()
@@ -1183,6 +1185,22 @@ def CMDstatus(parser, args):
   return 0
 
 
+def colorize_CMDstatus_doc():
+  """To be called once in main() to add colors to git cl status help."""
+  colors = [i for i in dir(Fore) if i[0].isupper()]

[iannucci, 2013/08/17 01:14:36]

Hm... this seems a bit sketchy.

Might as well:

colors = dict((n, v) for n, v in Fore.__dict__.iteritems() if n[0].isupper())
color_re = re.compile("- (%s)" % ("|".join(colors)))

etc.

[M-A Ruel, 2013/08/17 01:22:08]

If you really prefer but my version is faster. :)

+
+  def colorize_line(line):
+    for color in colors:
+      if color in line.upper():
+        # Extract whitespaces first and the leading '-'.
+        indent = len(line) - len(line.lstrip(' ')) + 1
+        return line[:indent] + getattr(Fore, color) + line[indent:] + Fore.RESET
+    return line
+
+  lines = CMDstatus.__doc__.splitlines()
+  CMDstatus.__doc__ = '\n'.join(colorize_line(l) for l in lines)
+
+
 @subcommand.usage('[issue_number]')
 def CMDissue(parser, args):
   """Sets or displays the current code review issue number.
@@ -2156,13 +2174,6 @@ class OptionParser(optparse.OptionParser):
     logging.basicConfig(level=levels[min(options.verbose, len(levels) - 1)])
     return options, args
 
-  def format_description(self, _):
-    """Disables automatic reformatting."""
-    lines = self.description.rstrip().splitlines()
-    lines_fixed = [lines[0]] + [l[2:] if len(l) >= 2 else l for l in lines[1:]]
-    description = ''.join(l + '\n' for l in lines_fixed)
-    return description[0].upper() + description[1:]
-
 
 def main(argv):
   if sys.hexversion < 0x02060000:
@@ -2175,6 +2186,7 @@ def main(argv):
   global settings
   settings = Settings()
 
+  colorize_CMDstatus_doc()
   dispatcher = subcommand.CommandDispatcher(__name__)
   try:
     return dispatcher.execute(OptionParser(), argv)