Refactoring: Long option names in push and merge scripts.

tools/push-to-trunk/auto_roll.py

 #!/usr/bin/env python
 # Copyright 2013 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
@@ skipping 34 matching lines @@
   DOT_GIT_LOCATION: ".git",
   SETTINGS_LOCATION: "~/.auto-roll",
 }
 
 
 class AutoRollOptions(CommonOptions):
   def __init__(self, options):
     super(AutoRollOptions, self).__init__(options)
     self.requires_editor = False
     self.status_password = options.status_password
-    self.c = options.c
+    self.chromium = options.chromium
     self.push = getattr(options, 'push', False)
-    self.author = getattr(options, 'a', None)
+    self.author = getattr(options, 'author', None)
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks()
     self.CommonPrepare()
 
 
@@ skipping 80 matching lines @@
       self.PushTreeStatus("Tree is closed (preparing to push)")
 
       # TODO(machenbach): Update the script before calling it.
       try:
         if self._options.push:
           self._side_effect_handler.Call(
               RunPushToTrunk,
               push_to_trunk.CONFIG,
               PushToTrunkOptions.MakeForcedOptions(self._options.author,
                                                    self._options.reviewer,
-                                                   self._options.c),
+                                                   self._options.chromium),
               self._side_effect_handler)
       finally:
         self.PushTreeStatus(self["tree_message"])
     else:
       print("ToT (r%d) is ahead of the LKGR (r%d). Skipping push to trunk."
             % (latest, lkgr))
 
 
 def RunAutoRoll(config,
                 options,
                 side_effect_handler=DEFAULT_SIDE_EFFECT_HANDLER):
   step_classes = [
     Preparation,
     CheckAutoRollSettings,
     CheckTreeStatus,
     FetchLatestRevision,
     CheckLastPush,
     FetchLKGR,
     PushToTrunk,
   ]
   RunScript(step_classes, config, options, side_effect_handler)
 
 
 def BuildOptions():
   parser = argparse.ArgumentParser()
-  parser.add_argument("-a", "--author", dest="a",
+  parser.add_argument("-a", "--author",
                       help="The author email used for rietveld.")
-  parser.add_argument("-c", "--chromium", dest="c",
+  parser.add_argument("-c", "--chromium",
                       help=("The path to your Chromium src/ directory to "
                             "automate the V8 roll."))
   parser.add_argument("-p", "--push",
                       help="Push to trunk if possible. Dry run if unspecified.",
                       default=False, action="store_true")
   parser.add_argument("-r", "--reviewer",
                       help="The account name to be used for reviews.")
-  parser.add_argument("-s", "--step", dest="s",
+  parser.add_argument("-s", "--step",
                       help="Specify the step where to start work. Default: 0.",
                       default=0, type=int)
   parser.add_argument("--status-password",
                       help="A file with the password to the status app.")
   return parser
 
 
 def Main():
   parser = BuildOptions()
   options = parser.parse_args()
-  if not options.a or not options.c or not options.reviewer:
+  if not options.author or not options.chromium or not options.reviewer:
     print "You need to specify author, chromium src location and reviewer."
     parser.print_help()
     return 1
   RunAutoRoll(CONFIG, AutoRollOptions(options))
 
 if __name__ == "__main__":
   sys.exit(Main())