Push roll candidates based on candidate ref instead of lkgr.

tools/push-to-trunk/auto_push.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 52 matching lines @@
 
   def RunStep(self):
     status_url = "https://v8-status.appspot.com/current?format=json"
     status_json = self.ReadURL(status_url, wait_plan=[5, 20, 300, 300])
     self["tree_message"] = json.loads(status_json)["message"]
     if re.search(r"nopush|no push", self["tree_message"], flags=re.I):
       self.Die("Push to trunk disabled by tree state: %s"
                % self["tree_message"])
 
 
-class FetchLKGR(Step):
-  MESSAGE = "Fetching V8 LKGR."
+class FetchCandidate(Step):
+  MESSAGE = "Fetching V8 roll candidate ref."
 
   def RunStep(self):
-    lkgr_url = "https://v8-status.appspot.com/lkgr"
-    # Retry several times since app engine might have issues.
-    self["lkgr"] = self.ReadURL(lkgr_url, wait_plan=[5, 20, 300, 300])
+    self.Git("fetch origin +refs/heads/candidate:refs/heads/candidate")
+    self["candidate"] = self.Git("show-ref -s refs/heads/candidate")
 
 
 class CheckLastPush(Step):
   MESSAGE = "Checking last V8 push to trunk."
 
   def RunStep(self):
     last_push = self.FindLastTrunkPush()
 
     # Retrieve the bleeding edge revision of the last push from the text in
     # the push commit message.
     last_push_title = self.GitLog(n=1, format="%s", git_hash=last_push)
     last_push_be = PUSH_MESSAGE_RE.match(last_push_title).group(1)
 
     if not last_push_be:  # pragma: no cover
       self.Die("Could not retrieve bleeding edge revision for trunk push %s"
                % last_push)
 
-    if self["lkgr"] == last_push_be:
-      print "Already pushed current lkgr %s" % last_push_be
+    if self["candidate"] == last_push_be:
+      print "Already pushed current candidate %s" % last_push_be
       return True
 
 
 class PushToCandidates(Step):
   MESSAGE = "Pushing to candidates if specified."
 
   def RunStep(self):
-    print "Pushing lkgr %s to candidates." % self["lkgr"]
+    print "Pushing candidate %s to candidates." % self["candidate"]
 
     args = [
       "--author", self._options.author,
       "--reviewer", self._options.reviewer,
-      "--revision", self["lkgr"],
+      "--revision", self["candidate"],
       "--force",
     ]
 
     if self._options.work_dir:
       args.extend(["--work-dir", self._options.work_dir])
 
     # TODO(machenbach): Update the script before calling it.
     if self._options.push:
       self._side_effect_handler.Call(push_to_trunk.PushToTrunk().Run, args)
 
@@ skipping 15 matching lines @@
     return {
       "PERSISTFILE_BASENAME": "/tmp/v8-auto-push-tempfile",
       "SETTINGS_LOCATION": "~/.auto-roll",
     }
 
   def _Steps(self):
     return [
       Preparation,
       CheckAutoPushSettings,
       CheckTreeStatus,
-      FetchLKGR,
+      FetchCandidate,
       CheckLastPush,
       PushToCandidates,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(AutoPush().Run())