Deprecate prepare push commit when pushing to trunk.

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 83 matching lines @@
       last_push_title = self.GitLog(n=1, format="%s", git_hash=last_push)
       last_push_be_svn = PUSH_MESSAGE_RE.match(last_push_title).group(1)
       if not last_push_be_svn:  # pragma: no cover
         self.Die("Could not retrieve bleeding edge revision for trunk push %s"
                  % last_push)
       last_push_bleeding_edge = self.GitSVNFindGitHash(last_push_be_svn)
       if not last_push_bleeding_edge:  # pragma: no cover
         self.Die("Could not retrieve bleeding edge git hash for trunk push %s"
                  % last_push)
 
-    # TODO(machenbach): last_push_trunk points to the svn revision on trunk.
-    # It is not used yet but we'll need it for retrieving the current version.
+    # This points to the svn revision of the last push on trunk.
     self["last_push_trunk"] = last_push
-    # TODO(machenbach): This currently points to the prepare push revision that
-    # will be deprecated soon. After the deprecation it will point to the last
-    # bleeding_edge revision that went into the last push.
+    # This points to the last bleeding_edge revision that went into the last
+    # push.
     self["last_push_bleeding_edge"] = last_push_bleeding_edge
 
 
 class IncrementVersion(Step):
   MESSAGE = "Increment version number."
 
   def RunStep(self):
     # Retrieve current version from last trunk push.
     self.GitCheckoutFile(self.Config(VERSION_FILE), self["last_push_trunk"])
     self.ReadAndPersistVersion()
@@ skipping 10 matching lines @@
     else:
       self.Editor(self.Config(VERSION_FILE))
 
     # Variables prefixed with 'new_' contain the new version numbers for the
     # ongoing trunk push.
     self.ReadAndPersistVersion("new_")
     self["version"] = "%s.%s.%s" % (self["new_major"],
                                     self["new_minor"],
                                     self["new_build"])
 
-    # TODO(machenbach): The following will be deprecated. Increment version
-    # numbers for version.cc on bleeding_edge (new build level on trunk + 1).
-    text = FileToText(self.Config(VERSION_FILE))
-    text = MSub(r"(?<=#define BUILD_NUMBER)(?P<space>\s+)\d*$",
-                r"\g<space>%s" % str(int(self["new_build"]) + 1),
-                text)
-    TextToFile(text, self.Config(VERSION_FILE))
-    self.ReadAndPersistVersion("new_be_")
-
 
 class PrepareChangeLog(Step):
   MESSAGE = "Prepare raw ChangeLog entry."
 
   def Reload(self, body):
     """Attempts to reload the commit message from rietveld in order to allow
     late changes to the LOG flag. Note: This is brittle to future changes of
     the web page name or structure.
     """
     match = re.search(r"^Review URL: https://codereview\.chromium\.org/(\d+)$",
                       body, flags=re.M)
     if match:
       cl_url = ("https://codereview.chromium.org/%s/description"
                 % match.group(1))
       try:
         # Fetch from Rietveld but only retry once with one second delay since
         # there might be many revisions.
         body = self.ReadURL(cl_url, wait_plan=[1])
       except urllib2.URLError:  # pragma: no cover
         pass
     return body
 
   def RunStep(self):
     self["date"] = self.GetDate()
     output = "%s: Version %s\n\n" % (self["date"], self["version"])
     TextToFile(output, self.Config(CHANGELOG_ENTRY_FILE))
+    # TODO(machenbach): Retrieve the push hash also from a command-line option.
     commits = self.GitLog(format="%H",
         git_hash="%s..HEAD" % self["last_push_bleeding_edge"])
 
     # Cache raw commit messages.
     commit_messages = [
       [
         self.GitLog(n=1, format="%s", git_hash=commit),
         self.Reload(self.GitLog(n=1, format="%B", git_hash=commit)),
         self.GitLog(n=1, format="%an", git_hash=commit),
       ] for commit in commits.splitlines()
@@ skipping 30 matching lines @@
     changelog_entry = "\n".join(map(Fill80, changelog_entry.splitlines()))
     changelog_entry = changelog_entry.lstrip()
 
     if changelog_entry == "":  # pragma: no cover
       self.Die("Empty ChangeLog entry.")
 
     # Safe new change log for adding it later to the trunk patch.
     TextToFile(changelog_entry, self.Config(CHANGELOG_ENTRY_FILE))
 
 
-class CommitLocal(Step):
-  MESSAGE = "Commit to local branch."
-
-  def RunStep(self):
-    self["prep_commit_msg"] = ("Prepare push to trunk.  "
-        "Now working on version %s.%s.%s." % (self["new_be_major"],
-                                              self["new_be_minor"],
-                                              self["new_be_build"]))
-
-    # Include optional TBR only in the git command. The persisted commit
-    # message is used for finding the commit again later.
-    if self._options.tbr_commit:
-      message = "%s\n\nTBR=%s" % (self["prep_commit_msg"],
-                                  self._options.reviewer)
-    else:
-      message = "%s" % self["prep_commit_msg"]
-    self.GitCommit(message)
-
-
-class CommitRepository(Step):
-  MESSAGE = "Commit to the repository."
-
-  def RunStep(self):
-    self.WaitForLGTM()
-    self.GitPresubmit()
-    self.GitDCommit()
-
-
 class StragglerCommits(Step):
   MESSAGE = ("Fetch straggler commits that sneaked in since this script was "
              "started.")
 
   def RunStep(self):
     self.GitSVNFetch()
     self.GitCheckout("svn/bleeding_edge")
-    self["prepare_commit_hash"] = self.GitLog(n=1, format="%H",
-                                              grep=self["prep_commit_msg"])
-    # TODO(machenbach): Retrieve the push hash from a command-line option or
-    # use ToT. The "prepare_commit_hash" will be deprecated along with the
-    # prepare push commit.
-    self["push_hash"] = self.GitLog(n=1, format="%H",
-                                    parent_hash=self["prepare_commit_hash"])
+    # TODO(machenbach): Retrieve the push hash also from a command-line option.
+    self["push_hash"] = self.GitLog(n=1, format="%H", git_hash="HEAD")
 
 
 class SquashCommits(Step):
   MESSAGE = "Squash commits into one."
 
   def RunStep(self):
     # Instead of relying on "git rebase -i", we'll just create a diff, because
     # that's easier to automate.
     TextToFile(self.GitDiff("svn/trunk", self["push_hash"]),
                self.Config(PATCH_FILE))
@@ skipping 80 matching lines @@
 
   def RunStep(self):
     self.GitCommit(file_name = self.Config(COMMITMSG_FILE))
     Command("rm", "-f %s*" % self.Config(COMMITMSG_FILE))
 
 
 class SanityCheck(Step):
   MESSAGE = "Sanity check."
 
   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?" % self.Config(VERSION_FILE)):
       self.Die("Execution canceled.")  # pragma: no cover
 
 
 class CommitSVN(Step):
   MESSAGE = "Commit to SVN."
 
   def RunStep(self):
@@ skipping 158 matching lines @@
     return True
 
   def _Steps(self):
     return [
       Preparation,
       FreshBranch,
       DetectLastPush,
       IncrementVersion,
       PrepareChangeLog,
       EditChangeLog,
-      CommitLocal,
-      UploadStep,
-      CommitRepository,
       StragglerCommits,
       SquashCommits,
       NewBranch,
       ApplyChanges,
       AddChangeLog,
       SetVersion,
       CommitTrunk,
       SanityCheck,
       CommitSVN,
       TagRevision,
       CheckChromium,
       SwitchChromium,
       UpdateChromiumCheckout,
       UploadCL,
       SwitchV8,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(PushToTrunk(CONFIG).Run())