Revert "Revert "Improve description layout. Improve coloring and add legend in help.""

trychange.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Client-side script to send a try job to the try server. It communicates to
 the try server by either writting to a svn repository or by directly connecting
 to the server by HTTP.
 """
 
@@ skipping 506 matching lines @@
       new_file = posixpath.join(path_diff, diff[i][4:]).replace('\\', '/')
       if diff[i].startswith('--- '):
         file_path = new_file.split('\t')[0].strip()
         if file_path.startswith('a/'):
           file_path = file_path[2:]
         changed_files.append(('M', file_path))
       diff[i] = diff[i][0:4] + new_file
   return (diff, changed_files)
 
 
+class OptionParser(optparse.OptionParser):
+  def format_epilog(self, _):
+    """Removes epilog formatting."""
+    return self.epilog or ''
+
+
 def gen_parser(prog):
   # Parse argv
-  parser = optparse.OptionParser(usage=USAGE,
-                                 version=__version__,
-                                 prog=prog)
+  parser = OptionParser(usage=USAGE, version=__version__, prog=prog)
   parser.add_option("-v", "--verbose", action="count", default=0,
                     help="Prints debugging infos")
   group = optparse.OptionGroup(parser, "Result and status")
   group.add_option("-u", "--user", default=getpass.getuser(),
                    help="Owner user name [default: %default]")
   group.add_option("-e", "--email",
                    default=os.environ.get('TRYBOT_RESULTS_EMAIL_ADDRESS',
                         os.environ.get('EMAIL_ADDRESS')),
                    help="Email address where to send the results. Use either "
                         "the TRYBOT_RESULTS_EMAIL_ADDRESS environment "
@@ skipping 126 matching lines @@
   Args:
     argv: Arguments and options.
     change: Change instance corresponding to the CL.
     swallow_exception: Whether we raise or swallow exceptions.
   """
   parser = gen_parser(prog)
   epilog = EPILOG % { 'prog': prog }
   if extra_epilog:
     epilog += extra_epilog
   parser.epilog = epilog
-  # Remove epilog formatting
-  parser.format_epilog = lambda x: parser.epilog
 
   options, args = parser.parse_args(argv)
 
   # If they've asked for help, give it to them
   if len(args) == 1 and args[0] == 'help':
     parser.print_help()
     return 0
 
   # If they've said something confusing, don't spawn a try job until you
   # understand what they want.
@@ skipping 196 matching lines @@
     return 1
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, e
     return 1
   return 0
 
 
 if __name__ == "__main__":
   fix_encoding.fix_encoding()
   sys.exit(TryChange(None, None, False))