Merged r19443 into trunk branch.

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 45 matching lines @@
   @staticmethod
   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.reviewer = options.reviewer
     self.c = options.c
     self.author = getattr(options, 'a', None)
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks()
     self.CommonPrepare()
     self.PrepareBranch()
@@ skipping 145 matching lines @@
   def RunStep(self):
     self.RestoreVersionIfUnset("new_")
     prep_commit_msg = ("Prepare push to trunk.  "
         "Now working on version %s.%s.%s." % (self._state["new_major"],
                                               self._state["new_minor"],
                                               self._state["new_build"]))
     self.Persist("prep_commit_msg", prep_commit_msg)
 
     # Include optional TBR only in the git command. The persisted commit
     # message is used for finding the commit again later.
-    review = "\n\nTBR=%s" % self._options.r if self._options.tbr_commit else ""
+    if self._options.tbr_commit:
+      review = "\n\nTBR=%s" % self._options.reviewer
+    else:
+      review = ""
     if self.Git("commit -a -m \"%s%s\"" % (prep_commit_msg, review)) is None:
       self.Die("'git commit -a' failed.")
 
 
 class CommitRepository(Step):
   MESSAGE = "Commit to the repository."
 
   def RunStep(self):
     self.WaitForLGTM()
     # Re-read the ChangeLog entry (to pick up possible changes).
@@ skipping 220 matching lines @@
     deps = FileToText(self.Config(DEPS_FILE))
     deps = re.sub("(?<=\"v8_revision\": \")([0-9]+)(?=\")",
                   self._state["trunk_revision"],
                   deps)
     TextToFile(deps, self.Config(DEPS_FILE))
 
     self.RestoreVersionIfUnset()
     ver = "%s.%s.%s" % (self._state["major"],
                         self._state["minor"],
                         self._state["build"])
-    if self._options.r:
-      print "Using account %s for review." % self._options.r
-      rev = self._options.r
+    if self._options.reviewer:
+      print "Using account %s for review." % self._options.reviewer
+      rev = self._options.reviewer
     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.")
@@ skipping 83 matching lines @@
                           "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",
                     help="Prompt the user at every important step.",
                     default=False, action="store_true")
-  result.add_option("-r", "--reviewer", dest="r",
+  result.add_option("-r", "--reviewer",
                     help=("Specify the account name to be used for reviews."))
   result.add_option("-s", "--step", dest="s",
                     help="Specify the step where to start work. Default: 0.",
                     default=0, type="int")
   return result
 
 
 def ProcessOptions(options):
   if options.s < 0:
     print "Bad step number %d" % options.s
     return False
-  if not options.m and not options.r:
+  if not options.m and not options.reviewer:
     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())