Clean up release scripts.

tools/push-to-trunk/chromium_roll.py

 #!/usr/bin/env python
 # Copyright 2014 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import os
 import sys
 
 from common_includes import *
 
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     # Update v8 remote tracking branches.
     self.GitFetchOrigin()
 
 
 class DetectLastPush(Step):
-  MESSAGE = "Detect commit ID of last push to trunk."
+  MESSAGE = "Detect commit ID of last push to candidates."
 
   def RunStep(self):
-    self["last_push"] = self._options.last_push or self.FindLastTrunkPush(
+    self["last_push"] = self._options.last_push or self.FindLastCandidatesPush(
         branch="origin/candidates", include_patches=True)
     self["push_title"] = self.GitLog(n=1, format="%s",
                                      git_hash=self["last_push"])
 
 
 class SwitchChromium(Step):
   MESSAGE = "Switch to Chromium checkout."
 
   def RunStep(self):
     self["v8_path"] = os.getcwd()
@@ skipping 75 matching lines @@
     # Clean up all temporary files.
     Command("rm", "-f %s*" % self._config["PERSISTFILE_BASENAME"])
 
 
 class ChromiumRoll(ScriptsBase):
   def _PrepareOptions(self, parser):
     parser.add_argument("-c", "--chromium", required=True,
                         help=("The path to your Chromium src/ "
                               "directory to automate the V8 roll."))
     parser.add_argument("-l", "--last-push",
-                        help="The git commit ID of the last push to trunk.")
+                        help="The git commit ID of the last candidates push.")
     parser.add_argument("--use-commit-queue",
                         help="Check the CQ bit on upload.",
                         default=False, action="store_true")
 
   def _ProcessOptions(self, options):  # pragma: no cover
     if not options.author or not options.reviewer:
       print "A reviewer (-r) and an author (-a) are required."
       return False
 
     options.requires_editor = False
@@ skipping 14 matching lines @@
       SwitchChromium,
       UpdateChromiumCheckout,
       UploadCL,
       SwitchV8,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(ChromiumRoll().Run())