Let auto-roll push the lkgr.

tools/push-to-trunk/auto_roll.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 26 matching lines @@
 import push_to_trunk
 
 SETTINGS_LOCATION = "SETTINGS_LOCATION"
 
 CONFIG = {
   PERSISTFILE_BASENAME: "/tmp/v8-auto-roll-tempfile",
   DOT_GIT_LOCATION: ".git",
   SETTINGS_LOCATION: "~/.auto-roll",
 }
 
+PUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision r(\d+)\)$")
+
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks()
     self.CommonPrepare()
 
 
 class CheckAutoRollSettings(Step):
@@ skipping 13 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 FetchLatestRevision(Step):
-  MESSAGE = "Fetching latest V8 revision."
-
-  def RunStep(self):
-    match = re.match(r"^r(\d+) ", self.GitSVNLog())
-    if not match:  # pragma: no cover
-      self.Die("Could not extract current svn revision from log.")
-    self["latest"] = match.group(1)
-
-
-class CheckLastPush(Step):
-  MESSAGE = "Checking last V8 push to trunk."
-
-  def RunStep(self):
-    last_push_hash = self.FindLastTrunkPush()
-    last_push = int(self.GitSVNFindSVNRev(last_push_hash))
-
-    # TODO(machenbach): This metric counts all revisions. It could be
-    # improved by counting only the revisions on bleeding_edge.
-    if int(self["latest"]) - last_push < 10:  # pragma: no cover
-      # This makes sure the script doesn't push twice in a row when the cron
-      # job retries several times.
-      self.Die("Last push too recently: %d" % last_push)
-
-
 class FetchLKGR(Step):
   MESSAGE = "Fetching V8 LKGR."
 
   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])
 
 
+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)
+
+    # TODO(machenbach): This metric counts all revisions. It could be
+    # improved by counting only the revisions on bleeding_edge.
+    if int(self["lkgr"]) - int(last_push_be) < 10:  # pragma: no cover
+      # This makes sure the script doesn't push twice in a row when the cron
+      # job retries several times.
+      self.Die("Last push too recently: %s" % last_push_be)
+
+
 class PushToTrunk(Step):
-  MESSAGE = "Pushing to trunk if possible."
+  MESSAGE = "Pushing to trunk if specified."
 
   def PushTreeStatus(self, message):
     if not self._options.status_password:
       print "Skipping tree status update without password file."
       return
     params = {
       "message": message,
       "username": "v8-auto-roll@chromium.org",
       "password": FileToText(self._options.status_password).strip(),
     }
     params = urllib.urlencode(params)
     print "Pushing tree status: '%s'" % message
     self.ReadURL("https://v8-status.appspot.com/status", params,
                  wait_plan=[5, 20])
 
   def RunStep(self):
-    latest = int(self["latest"])
-    lkgr = int(self["lkgr"])
-    if latest == lkgr:
-      print "ToT (r%d) is clean. Pushing to trunk." % latest
-      self.PushTreeStatus("Tree is closed (preparing to push)")
+    print "Pushing lkgr %s to trunk." % self["lkgr"]
+    self.PushTreeStatus("Tree is closed (preparing to push)")
 
-      # TODO(machenbach): Update the script before calling it.
-      try:
-        if self._options.push:
-          P = push_to_trunk.PushToTrunk
-          self._side_effect_handler.Call(
-              P(push_to_trunk.CONFIG, self._side_effect_handler).Run,
-              ["-a", self._options.author,
-               "-r", self._options.reviewer,
-               "-f"])
-      finally:
-        self.PushTreeStatus(self["tree_message"])
-    else:
-      print("ToT (r%d) is ahead of the LKGR (r%d). Skipping push to trunk."
-            % (latest, lkgr))
+    # TODO(machenbach): Update the script before calling it.
+    try:
+      if self._options.push:
+        P = push_to_trunk.PushToTrunk
+        self._side_effect_handler.Call(
+            P(push_to_trunk.CONFIG, self._side_effect_handler).Run,
+            ["-author", self._options.author,
+             "-reviewer", self._options.reviewer,
+             "-revision", self["lkgr"],
+             "-force"])
+    finally:
+      self.PushTreeStatus(self["tree_message"])
 
 
 class AutoRoll(ScriptsBase):
   def _PrepareOptions(self, parser):
     parser.add_argument("-c", "--chromium",
                         help=("Deprecated."))
     parser.add_argument("-p", "--push",
                         help="Push to trunk. Dry run if unspecified.",
                         default=False, action="store_true")
     parser.add_argument("--status-password",
                         help="A file with the password to the status app.")
 
   def _ProcessOptions(self, options):
     if not options.author or not options.reviewer:  # pragma: no cover
       print "You need to specify author and reviewer."
       return False
     options.requires_editor = False
     return True
 
   def _Steps(self):
     return [
       Preparation,
       CheckAutoRollSettings,
       CheckTreeStatus,
-      FetchLatestRevision,
+      FetchLKGR,
       CheckLastPush,
-      FetchLKGR,
       PushToTrunk,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(AutoRoll(CONFIG).Run())