Enable specification of author email in push-to-trunk.

tools/push-to-trunk/push_to_trunk.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 36 matching lines @@
   CHANGELOG_FILE: "ChangeLog",
   CHANGELOG_ENTRY_FILE: "/tmp/v8-push-to-trunk-tempfile-changelog-entry",
   PATCH_FILE: "/tmp/v8-push-to-trunk-tempfile-patch-file",
   COMMITMSG_FILE: "/tmp/v8-push-to-trunk-tempfile-commitmsg",
   DEPS_FILE: "DEPS",
 }
 
 
 class PushToTrunkOptions(CommonOptions):
   @staticmethod
-  def MakeForcedOptions(reviewer, chrome_path):
+  def MakeForcedOptions(author, reviewer, chrome_path):
     """Convenience wrapper."""
     class Options(object):
       pass
     options = Options()
     options.s = 0
     options.l = None
     options.f = True
     options.m = False
     options.r = reviewer
     options.c = chrome_path
+    options.a = author
     return PushToTrunkOptions(options)
 
   def __init__(self, options):
     super(PushToTrunkOptions, self).__init__(options, options.m)
     self.requires_editor = not options.f
     self.wait_for_lgtm = not options.f
     self.tbr_commit = not options.m
     self.l = options.l
     self.r = options.r
     self.c = options.c
+    self.author = getattr(options, 'a', None)
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks()
     self.CommonPrepare()
     self.PrepareBranch()
     self.DeleteBranch(self.Config(TRUNKBRANCH))
 
@@ skipping 397 matching lines @@
     else:
       print "Please enter the email address of a reviewer for the roll CL: ",
       self.DieNoManualMode("A reviewer must be specified in forced mode.")
       rev = self.ReadLine()
     self.RestoreIfUnset("svn_revision")
     args = ("commit -am \"Update V8 to version %s "
             "(based on bleeding_edge revision r%s).\n\nTBR=%s\""
             % (ver, self._state["svn_revision"], rev))
     if self.Git(args) is None:
       self.Die("'git commit' failed.")
+    author_option = self._options.author
+    author = " --email \"%s\"" % author_option if author_option else ""
     force_flag = " -f" if self._options.force_upload else ""
-    if self.Git("cl upload --send-mail%s" % force_flag, pipe=False) is None:
+    if self.Git("cl upload%s --send-mail%s" % (author, force_flag),
+                pipe=False) is None:
       self.Die("'git cl upload' failed, please try again.")
     print "CL uploaded."
 
 
 class SwitchV8(Step):
   MESSAGE = "Returning to V8 checkout."
   REQUIRES = "chrome_path"
 
   def RunStep(self):
     self.RestoreIfUnset("v8_path")
@@ skipping 54 matching lines @@
     UploadCL,
     SwitchV8,
     CleanUp,
   ]
 
   RunScript(step_classes, config, options, side_effect_handler)
 
 
 def BuildOptions():
   result = optparse.OptionParser()
+  result.add_option("-a", "--author", dest="a",
+                    help=("Specify the author email used for rietveld."))
   result.add_option("-c", "--chromium", dest="c",
                     help=("Specify the path to your Chromium src/ "
                           "directory to automate the V8 roll."))
   result.add_option("-f", "--force", dest="f",
                     help="Don't prompt the user.",
                     default=False, action="store_true")
   result.add_option("-l", "--last-push", dest="l",
                     help=("Manually specify the git commit ID "
                           "of the last push to trunk."))
   result.add_option("-m", "--manual", dest="m",
@@ skipping 13 matching lines @@
     return False
   if not options.m and not options.r:
     print "A reviewer (-r) is required in (semi-)automatic mode."
     return False
   if options.f and options.m:
     print "Manual and forced mode cannot be combined."
     return False
   if not options.m and not options.c:
     print "A chromium checkout (-c) is required in (semi-)automatic mode."
     return False
+  if not options.m and not options.a:
+    print "Specify your chromium.org email with -a in (semi-)automatic mode."
+    return False
   return True
 
 
 def Main():
   parser = BuildOptions()
   (options, args) = parser.parse_args()
   if not ProcessOptions(options):
     parser.print_help()
     return 1
   RunPushToTrunk(CONFIG, PushToTrunkOptions(options))
 
 if __name__ == "__main__":
   sys.exit(Main())