Clean up release scripts.

tools/push-to-trunk/merge_to_branch.py

 #!/usr/bin/env python
 # Copyright 2014 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 29 matching lines @@
 
   def RunStep(self):
     if os.path.exists(self.Config("ALREADY_MERGING_SENTINEL_FILE")):
       if self._options.force:
         os.remove(self.Config("ALREADY_MERGING_SENTINEL_FILE"))
       elif self._options.step == 0:  # pragma: no cover
         self.Die("A merge is already in progress")
     open(self.Config("ALREADY_MERGING_SENTINEL_FILE"), "a").close()
 
     self.InitialEnvironmentChecks(self.default_cwd)
-    if self._options.revert_bleeding_edge:
-      # FIXME(machenbach): Make revert bleeding_edge obsolete?
-      self["merge_to_branch"] = "bleeding_edge"
+    if self._options.revert_master:
+      # FIXME(machenbach): Make revert master obsolete?
+      self["merge_to_branch"] = "master"
     elif self._options.branch:
       self["merge_to_branch"] = self._options.branch
     else:  # pragma: no cover
       self.Die("Please specify a branch to merge to")
 
     self.CommonPrepare()
     self.PrepareBranch()
 
 
 class CreateBranch(Step):
@@ skipping 41 matching lines @@
 
   def RunStep(self):
 
     # Stringify: [123, 234] -> "r123, r234"
     self["revision_list"] = ", ".join(map(lambda s: "r%s" % s,
                                       self["full_revision_list"]))
 
     if not self["revision_list"]:  # pragma: no cover
       self.Die("Revision list is empty.")
 
-    if self._options.revert and not self._options.revert_bleeding_edge:
+    if self._options.revert and not self._options.revert_master:
       action_text = "Rollback of %s"
     else:
       action_text = "Merged %s"
 
     # The commit message title is added below after the version is specified.
     msg_pieces = [
       "\n".join(action_text % s for s in self["full_revision_list"]),
     ]
     msg_pieces.append("\n\n")
 
@@ skipping 24 matching lines @@
       TextToFile(patch, self.Config("TEMPORARY_PATCH_FILE"))
       self.ApplyPatch(self.Config("TEMPORARY_PATCH_FILE"), self._options.revert)
     if self._options.patch:
       self.ApplyPatch(self._options.patch, self._options.revert)
 
 
 class PrepareVersion(Step):
   MESSAGE = "Prepare version file."
 
   def RunStep(self):
-    if self._options.revert_bleeding_edge:
+    if self._options.revert_master:
       return
     # This is used to calculate the patch level increment.
     self.ReadAndPersistVersion()
 
 
 class IncrementVersion(Step):
   MESSAGE = "Increment version number."
 
   def RunStep(self):
-    if self._options.revert_bleeding_edge:
+    if self._options.revert_master:
       return
     new_patch = str(int(self["patch"]) + 1)
     if self.Confirm("Automatically increment PATCH_LEVEL? (Saying 'n' will "
                     "fire up your EDITOR on %s so you can make arbitrary "
                     "changes. When you're done, save the file and exit your "
                     "EDITOR.)" % VERSION_FILE):
       text = FileToText(os.path.join(self.default_cwd, VERSION_FILE))
       text = MSub(r"(?<=#define PATCH_LEVEL)(?P<space>\s+)\d*$",
                   r"\g<space>%s" % new_patch,
                   text)
       TextToFile(text, os.path.join(self.default_cwd, VERSION_FILE))
     else:
       self.Editor(os.path.join(self.default_cwd, VERSION_FILE))
     self.ReadAndPersistVersion("new_")
     self["version"] = "%s.%s.%s.%s" % (self["new_major"],
                                        self["new_minor"],
                                        self["new_build"],
                                        self["new_patch"])
 
 
 class CommitLocal(Step):
   MESSAGE = "Commit to local branch."
 
   def RunStep(self):
     # Add a commit message title.
-    if self._options.revert and self._options.revert_bleeding_edge:
+    if self._options.revert and self._options.revert_master:
       # TODO(machenbach): Find a better convention if multiple patches are
       # reverted in one CL.
       self["commit_title"] = "Revert on master"
     else:
       self["commit_title"] = "Version %s (cherry-pick)" % self["version"]
     self["new_commit_msg"] = "%s\n\n%s" % (self["commit_title"],
                                            self["new_commit_msg"])
     TextToFile(self["new_commit_msg"], self.Config("COMMITMSG_FILE"))
     self.GitCommit(file_name=self.Config("COMMITMSG_FILE"))
 
 
 class CommitRepository(Step):
   MESSAGE = "Commit to the repository."
 
   def RunStep(self):
     self.GitCheckout(self.Config("BRANCHNAME"))
     self.WaitForLGTM()
     self.GitPresubmit()
     self.vc.CLLand()
 
 
 class TagRevision(Step):
   MESSAGE = "Create the tag."
 
   def RunStep(self):
-    if self._options.revert_bleeding_edge:
+    if self._options.revert_master:
       return
     print "Creating tag %s" % self["version"]
     self.vc.Tag(self["version"],
                 self.vc.RemoteBranch(self["merge_to_branch"]),
                 self["commit_title"])
 
 
 class CleanUp(Step):
   MESSAGE = "Cleanup."
 
   def RunStep(self):
     self.CommonCleanup()
-    if not self._options.revert_bleeding_edge:
+    if not self._options.revert_master:
       print "*** SUMMARY ***"
       print "version: %s" % self["version"]
       print "branch: %s" % self["merge_to_branch"]
       if self["revision_list"]:
         print "patches: %s" % self["revision_list"]
 
 
 class MergeToBranch(ScriptsBase):
   def _Description(self):
     return ("Performs the necessary steps to merge revisions from "
-            "bleeding_edge to other branches, including trunk.")
+            "master to other branches, including candidates.")
 
   def _PrepareOptions(self, parser):
     group = parser.add_mutually_exclusive_group(required=True)
     group.add_argument("--branch", help="The branch to merge to.")
-    group.add_argument("-R", "--revert-bleeding-edge",
-                       help="Revert specified patches from bleeding edge.",
+    group.add_argument("-R", "--revert-master",
+                       help="Revert specified patches from master.",
                        default=False, action="store_true")
     parser.add_argument("revisions", nargs="*",
                         help="The revisions to merge.")
     parser.add_argument("-f", "--force",
                         help="Delete sentinel file.",
                         default=False, action="store_true")
     parser.add_argument("-m", "--message",
                         help="A commit message for the patch.")
     parser.add_argument("--revert",
                         help="Revert specified patches.",
                         default=False, action="store_true")
     parser.add_argument("-p", "--patch",
                         help="A patch file to apply as part of the merge.")
 
   def _ProcessOptions(self, options):
-    # TODO(machenbach): Add a test that covers revert from bleeding_edge
+    # TODO(machenbach): Add a test that covers revert from master
     if len(options.revisions) < 1:
       if not options.patch:
         print "Either a patch file or revision numbers must be specified"
         return False
       if not options.message:
         print "You must specify a merge comment if no patches are specified"
         return False
     options.bypass_upload_hooks = True
     # CC ulan to make sure that fixes are merged to Google3.
     options.cc = "ulan@chromium.org"
@@ skipping 29 matching lines @@
       CommitLocal,
       UploadStep,
       CommitRepository,
       TagRevision,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(MergeToBranch().Run())