Switch release scripts to pure git.

tools/push-to-trunk/push_to_trunk.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 16 matching lines @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 import argparse
 import os
 import sys
 import tempfile
 import urllib2
 
 from common_includes import *
 
-PUSH_MSG_SVN_RE = re.compile(r".* \(based on bleeding_edge revision r(\d+)\)$")
 PUSH_MSG_GIT_SUFFIX = " (based on %s)"
 PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$")
 
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     self.InitialEnvironmentChecks(self.default_cwd)
     self.CommonPrepare()
 
@@ skipping 38 matching lines @@
       last_push = self.FindLastTrunkPush(parent_hash=last_push)
 
     if self._options.last_bleeding_edge:
       # Read the bleeding edge revision of the last push from a command-line
       # option.
       last_push_bleeding_edge = self._options.last_bleeding_edge
     else:
       # 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)
-      # TODO(machenbach): This is only needed for the git transition. Can be
-      # removed after one successful trunk push.
-      match = PUSH_MSG_SVN_RE.match(last_push_title)
-      if match:
-        last_push_be_svn = match.group(1)
-        if not last_push_be_svn:  # pragma: no cover
-          self.Die("Could not retrieve bleeding edge rev for trunk push %s"
-                   % last_push)
-        last_push_bleeding_edge = self.vc.SvnGit(last_push_be_svn)
-      else:
-        last_push_bleeding_edge = PUSH_MSG_GIT_RE.match(
-            last_push_title).group("git_rev")
+      last_push_bleeding_edge = PUSH_MSG_GIT_RE.match(
+          last_push_title).group("git_rev")
 
       if not last_push_bleeding_edge:  # pragma: no cover
         self.Die("Could not retrieve bleeding edge git hash for trunk push %s"
                  % last_push)
 
     # This points to the git hash of the last push on trunk.
     self["last_push_trunk"] = last_push
     # This points to the last bleeding_edge revision that went into the last
     # push.
     # TODO(machenbach): Do we need a check to make sure we're not pushing a
@@ skipping 232 matching lines @@
 
   def RunStep(self):
     # TODO(machenbach): Run presubmit script here as it is now missing in the
     # prepare push process.
     if not self.Confirm("Please check if your local checkout is sane: Inspect "
         "%s, compile, run tests. Do you want to commit this new trunk "
         "revision to the repository?" % VERSION_FILE):
       self.Die("Execution canceled.")  # pragma: no cover
 
 
-class CommitSVN(Step):
-  MESSAGE = "Commit to SVN."
+class Land(Step):
+  MESSAGE = "Land the patch."
 
   def RunStep(self):
-    if self._options.svn:
-      self.SVNCommit("trunk", self["commit_title"])
-    else:
-      self.vc.Land()
+    self.vc.Land()
 
 
 class TagRevision(Step):
   MESSAGE = "Tag the new revision."
 
   def RunStep(self):
     self.vc.Tag(
         self["version"], self.vc.RemoteCandidateBranch(), self["commit_title"])
 
 
@@ skipping 60 matching lines @@
       PrepareChangeLog,
       EditChangeLog,
       StragglerCommits,
       SquashCommits,
       NewBranch,
       ApplyChanges,
       AddChangeLog,
       SetVersion,
       CommitTrunk,
       SanityCheck,
-      CommitSVN,
+      Land,
       TagRevision,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(PushToTrunk().Run())