Refactoring: Long option names in push and merge scripts.

tools/push-to-trunk/merge_to_branch.py

 #!/usr/bin/env python
 # Copyright 2014 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 53 matching lines @@
     self.revisions = options.revisions
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     if os.path.exists(self.Config(ALREADY_MERGING_SENTINEL_FILE)):
       if self._options.delete_sentinel:
         os.remove(self.Config(ALREADY_MERGING_SENTINEL_FILE))
-      elif self._options.s == 0:
+      elif self._options.step == 0:
         self.Die("A merge is already in progress")
     open(self.Config(ALREADY_MERGING_SENTINEL_FILE), "a").close()
 
     self.InitialEnvironmentChecks()
     if self._options.revert_bleeding_edge:
       self["merge_to_branch"] = "bleeding_edge"
     elif self._options.branch:
       self["merge_to_branch"] = self._options.branch
     else:
       self.Die("Please specify a branch to merge to")
@@ skipping 241 matching lines @@
   parser.add_argument("-f",
                       help="Delete sentinel file.",
                       default=False, action="store_true")
   parser.add_argument("-m", "--message",
                       help="A commit message for the patch.")
   parser.add_argument("-r", "--revert",
                       help="Revert specified patches.",
                       default=False, action="store_true")
   parser.add_argument("-p", "--patch", dest="p",
                       help="A patch file to apply as part of the merge.")
-  parser.add_argument("-s", "--step", dest="s",
+  parser.add_argument("-s", "--step",
                       help="The step where to start work. Default: 0.",
                       default=0, type=int)
   return parser
 
 
 def ProcessOptions(options):
   # TODO(machenbach): Add a test that covers revert from bleeding_edge
   if len(options.revisions) < 1:
     if not options.patch:
       print "Either a patch file or revision numbers must be specified"
       return False
     if not options.message:
       print "You must specify a merge comment if no patches are specified"
       return False
   return True
 
 
 def Main():
   parser = BuildOptions()
   options = parser.parse_args()
   if not ProcessOptions(options):
     parser.print_help()
     return 1
   RunMergeToBranch(CONFIG, MergeToBranchOptions(options))
 
 if __name__ == "__main__":
   sys.exit(Main())