Switch auto push script to git.

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 18 matching lines @@
 import argparse
 import json
 import os
 import re
 import sys
 import urllib
 
 from common_includes import *
 import push_to_trunk
 
-PUSH_MESSAGE_RE = re.compile(r".* \(based on bleeding_edge revision r(\d+)\)$")
+PUSH_MESSAGE_RE = re.compile(r".* \(based on ([a-fA-F0-9]+)\)$")
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks(self.default_cwd)
     self.CommonPrepare()
 
 
 class CheckAutoPushSettings(Step):
@@ skipping 37 matching lines @@
 
     # 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)
+    if self["lkgr"] == last_push_be:
+      print "Already pushed current lkgr %s" % last_push_be
+      return True
 
 
-class PushToTrunk(Step):
-  MESSAGE = "Pushing to trunk if specified."
+class PushToCandidates(Step):
+  MESSAGE = "Pushing to candidates if specified."
 
   def RunStep(self):
-    print "Pushing lkgr %s to trunk." % self["lkgr"]
+    print "Pushing lkgr %s to candidates." % self["lkgr"]
 
     # TODO(machenbach): Update the script before calling it.
     if self._options.push:
       self._side_effect_handler.Call(
           push_to_trunk.PushToTrunk().Run,
           ["--author", self._options.author,
            "--reviewer", self._options.reviewer,
            "--revision", self["lkgr"],
            "--force"])
 
@@ skipping 17 matching lines @@
       "SETTINGS_LOCATION": "~/.auto-roll",
     }
 
   def _Steps(self):
     return [
       Preparation,
       CheckAutoPushSettings,
       CheckTreeStatus,
       FetchLKGR,
       CheckLastPush,
-      PushToTrunk,
+      PushToCandidates,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(AutoPush().Run())