Clean up release scripts.

tools/push-to-trunk/auto_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 json
 import os
 import sys
 import urllib
@@ skipping 21 matching lines @@
     }
     params = urllib.urlencode(params)
     search_url = "https://codereview.chromium.org/search"
     result = self.ReadURL(search_url, params, wait_plan=[5, 20])
     if self.ContainsChromiumRoll(json.loads(result)["results"]):
       print "Stop due to existing Chromium roll."
       return True
 
 
 class DetectLastPush(Step):
-  MESSAGE = "Detect commit ID of the last push to trunk."
+  MESSAGE = "Detect commit ID of the last push to candidates."
 
   def RunStep(self):
     self.vc.Fetch()
-    push_hash = self.FindLastTrunkPush(
+    push_hash = self.FindLastCandidatesPush(
         branch="origin/candidates", include_patches=True)
     self["last_push"] = self.GetCommitPositionNumber(push_hash)
 
 
 class DetectLastRoll(Step):
   MESSAGE = "Detect commit ID of the last Chromium roll."
 
   def RunStep(self):
     # Interpret the DEPS file to retrieve the v8 revision.
     # TODO(machenbach): This should be part or the roll-deps api of
     # depot_tools.
     Var = lambda var: '%s'
     exec(FileToText(os.path.join(self._options.chromium, "DEPS")))
     last_roll = self.GetCommitPositionNumber(vars['v8_revision'])
-    # FIXME(machenbach): When rolling from bleeding edge and from trunk there
-    # be different commit numbers here. Better use version?
+    # FIXME(machenbach): When rolling from master and from candidates there
+    # will be different commit numbers here. Better use version?
     if int(last_roll) >= int(self["last_push"]):
       print("There is no newer v8 revision than the one in Chromium (%s)."
             % last_roll)
       return True
 
 
 class CheckClusterFuzz(Step):
   MESSAGE = "Check ClusterFuzz api for new problems."
 
   def RunStep(self):
@@ skipping 60 matching lines @@
       CheckActiveRoll,
       DetectLastPush,
       DetectLastRoll,
       CheckClusterFuzz,
       RollChromium,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(AutoRoll().Run())