Refactoring: Long option names in push and merge scripts.

tools/push-to-trunk/common_includes.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 212 matching lines @@
 
 
 class GitFailedException(Exception):
   pass
 
 
 class CommonOptions(object):
   def __init__(self, options, manual=True):
     self.requires_editor = True
     self.wait_for_lgtm = True
-    self.s = options.s
+    self.step = options.step
     self.force_readline_defaults = not manual
     self.force_upload = not manual
     self.manual = manual
     self.reviewer = getattr(options, 'reviewer', "")
-    self.author = getattr(options, 'a', "")
+    self.author = getattr(options, 'author', "")
 
 
 class Step(GitRecipesMixin):
   def __init__(self, text, requires, number, config, state, options, handler):
     self._text = text
     self._requires = requires
     self._number = number
     self._config = config
     self._state = state
     self._options = options
@@ skipping 251 matching lines @@
     return step_class(message, requires, number=number, config=config,
                       state=state, options=options,
                       handler=side_effect_handler)
 
 
 def RunScript(step_classes,
               config,
               options,
               side_effect_handler=DEFAULT_SIDE_EFFECT_HANDLER):
   state_file = "%s-state.json" % config[PERSISTFILE_BASENAME]
-  if options.s == 0 and os.path.exists(state_file):
+  if options.step == 0 and os.path.exists(state_file):
     os.remove(state_file)
   state = {}
   steps = []
   for (number, step_class) in enumerate(step_classes):
     steps.append(MakeStep(step_class, number, state, config,
                           options, side_effect_handler))
 
-  for step in steps[options.s:]:
+  for step in steps[options.step:]:
     step.Run()