Refactoring: Long option names in push and merge scripts.

tools/push-to-trunk/common_includes.py

Index: tools/push-to-trunk/common_includes.py
diff --git a/tools/push-to-trunk/common_includes.py b/tools/push-to-trunk/common_includes.py
index d2f39e768a4e0a92bf5f95ac0e3e3b9ee4dc54c8..9ebf3d22d5ba8d9534b4f126e8aa8a76fd2d92c4 100644
--- a/tools/push-to-trunk/common_includes.py
+++ b/tools/push-to-trunk/common_includes.py
@@ -230,12 +230,12 @@ 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):
@@ -507,7 +507,7 @@ def RunScript(step_classes,
               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 = []
@@ -515,5 +515,5 @@ def RunScript(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()