[release] Remove logic for handling the ChangeLog

https://v8.dev/blog/tags/release is the new ChangeLog!

This also removes an unused file push_to_candidate.py which wasn't deleted
earlier as it's intertwined a lot in test cases. This CL also cleans that
up.

Furthermore, logic for selecting CLs for the ChangeLog (using LOG= lines)
is removed as well. Nobody has used this feature for more than 5 release
cycles.

We'll delete the ChangeLog file in a separate CL.

Bug: v8:10010
No-Try: true
Change-Id: Idee551dc0600c3df9f784cc543897e3e18517ca1
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1930616Reviewed-by: Tamer Tas <tmrts@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#65191}

tools/release/common_includes.py

@@ -48,7 +48,6 @@ import urllib2
 from git_recipes import GitRecipesMixin
 from git_recipes import GitFailedException
 
-CHANGELOG_FILE = "ChangeLog"
 DAY_IN_SECONDS = 24 * 60 * 60
 PUSH_MSG_GIT_RE = re.compile(r".* \(based on (?P<git_rev>[a-fA-F0-9]+)\)$")
 PUSH_MSG_NEW_RE = re.compile(r"^Version \d+\.\d+\.\d+$")
@@ -93,99 +92,6 @@ def MSub(rexp, replacement, text):
   return re.sub(rexp, replacement, text, flags=re.MULTILINE)
 
 
-def Fill80(line):
-  # Replace tabs and remove surrounding space.
-  line = re.sub(r"\t", r"        ", line.strip())
-
-  # Format with 8 characters indentation and line width 80.
-  return textwrap.fill(line, width=80, initial_indent="        ",
-                       subsequent_indent="        ")
-
-
-def MakeComment(text):
-  return MSub(r"^( ?)", "#", text)
-
-
-def StripComments(text):
-  # Use split not splitlines to keep terminal newlines.
-  return "\n".join(filter(lambda x: not x.startswith("#"), text.split("\n")))
-
-
-def MakeChangeLogBody(commit_messages, auto_format=False):
-  result = ""
-  added_titles = set()
-  for (title, body, author) in commit_messages:
-    # TODO(machenbach): Better check for reverts. A revert should remove the
-    # original CL from the actual log entry.
-    title = title.strip()
-    if auto_format:
-      # Only add commits that set the LOG flag correctly.
-      log_exp = r"^[ \t]*LOG[ \t]*=[ \t]*(?:(?:Y(?:ES)?)|TRUE)"
-      if not re.search(log_exp, body, flags=re.I | re.M):
-        continue
-      # Never include reverts.
-      if title.startswith("Revert "):
-        continue
-      # Don't include duplicates.
-      if title in added_titles:
-        continue
-
-    # Add and format the commit's title and bug reference. Move dot to the end.
-    added_titles.add(title)
-    raw_title = re.sub(r"(\.|\?|!)$", "", title)
-    bug_reference = MakeChangeLogBugReference(body)
-    space = " " if bug_reference else ""
-    result += "%s\n" % Fill80("%s%s%s." % (raw_title, space, bug_reference))
-
-    # Append the commit's author for reference if not in auto-format mode.
-    if not auto_format:
-      result += "%s\n" % Fill80("(%s)" % author.strip())
-
-    result += "\n"
-  return result
-
-
-def MakeChangeLogBugReference(body):
-  """Grep for "BUG=xxxx" lines in the commit message and convert them to
-  "(issue xxxx)".
-  """
-  crbugs = []
-  v8bugs = []
-
-  def AddIssues(text):
-    ref = re.match(r"^BUG[ \t]*=[ \t]*(.+)$", text.strip())
-    if not ref:
-      return
-    for bug in ref.group(1).split(","):
-      bug = bug.strip()
-      match = re.match(r"^v8:(\d+)$", bug)
-      if match: v8bugs.append(int(match.group(1)))
-      else:
-        match = re.match(r"^(?:chromium:)?(\d+)$", bug)
-        if match: crbugs.append(int(match.group(1)))
-
-  # Add issues to crbugs and v8bugs.
-  map(AddIssues, body.splitlines())
-
-  # Filter duplicates, sort, stringify.
-  crbugs = map(str, sorted(set(crbugs)))
-  v8bugs = map(str, sorted(set(v8bugs)))
-
-  bug_groups = []
-  def FormatIssues(prefix, bugs):
-    if len(bugs) > 0:
-      plural = "s" if len(bugs) > 1 else ""
-      bug_groups.append("%sissue%s %s" % (prefix, plural, ", ".join(bugs)))
-
-  FormatIssues("", v8bugs)
-  FormatIssues("Chromium ", crbugs)
-
-  if len(bug_groups) > 0:
-    return "(%s)" % ", ".join(bug_groups)
-  else:
-    return ""
-
-
 def SortingKey(version):
   """Key for sorting version number strings: '3.11' > '3.2.1.1'"""
   version_keys = map(int, version.split("."))
@@ -282,9 +188,6 @@ class SideEffectHandler(object):  # pragma: no cover
   def Sleep(self, seconds):
     time.sleep(seconds)
 
-  def GetDate(self):
-    return datetime.date.today().strftime("%Y-%m-%d")
-
   def GetUTCStamp(self):
     return time.mktime(datetime.datetime.utcnow().timetuple())
 
@@ -527,9 +430,6 @@ class Step(GitRecipesMixin):
     cmd = lambda: self._side_effect_handler.ReadURL(url, params)
     return self.Retry(cmd, retry_on, wait_plan)
 
-  def GetDate(self):
-    return self._side_effect_handler.GetDate()
-
   def Die(self, msg=""):
     if msg != "":
       print("Error: %s" % msg)

tools/release/create_release.py

@@ -77,64 +77,6 @@ class DetectLastRelease(Step):
     self["last_push_master"] = self.GetLatestReleaseBase()
 
 
-class PrepareChangeLog(Step):
-  MESSAGE = "Prepare raw ChangeLog entry."
-
-  def RunStep(self):
-    self["date"] = self.GetDate()
-    output = "%s: Version %s\n\n" % (self["date"], self["version"])
-    TextToFile(output, self.Config("CHANGELOG_ENTRY_FILE"))
-    commits = self.GitLog(format="%H",
-        git_hash="%s..%s" % (self["last_push_master"],
-                             self["push_hash"]))
-
-    # Cache raw commit messages.
-    commit_messages = [
-      [
-        self.GitLog(n=1, format="%s", git_hash=commit),
-        self.GitLog(n=1, format="%B", git_hash=commit),
-        self.GitLog(n=1, format="%an", git_hash=commit),
-      ] for commit in commits.splitlines()
-    ]
-
-    # Auto-format commit messages.
-    body = MakeChangeLogBody(commit_messages, auto_format=True)
-    AppendToFile(body, self.Config("CHANGELOG_ENTRY_FILE"))
-
-    msg = ("        Performance and stability improvements on all platforms."
-           "\n#\n# The change log above is auto-generated. Please review if "
-           "all relevant\n# commit messages from the list below are included."
-           "\n# All lines starting with # will be stripped.\n#\n")
-    AppendToFile(msg, self.Config("CHANGELOG_ENTRY_FILE"))
-
-    # Include unformatted commit messages as a reference in a comment.
-    comment_body = MakeComment(MakeChangeLogBody(commit_messages))
-    AppendToFile(comment_body, self.Config("CHANGELOG_ENTRY_FILE"))
-
-
-class EditChangeLog(Step):
-  MESSAGE = "Edit ChangeLog entry."
-
-  def RunStep(self):
-    print ("Please press <Return> to have your EDITOR open the ChangeLog "
-           "entry, then edit its contents to your liking. When you're done, "
-           "save the file and exit your EDITOR. ")
-    self.ReadLine(default="")
-    self.Editor(self.Config("CHANGELOG_ENTRY_FILE"))
-
-    # Strip comments and reformat with correct indentation.
-    changelog_entry = FileToText(self.Config("CHANGELOG_ENTRY_FILE")).rstrip()
-    changelog_entry = StripComments(changelog_entry)
-    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 candidates patch.
-    TextToFile(changelog_entry, self.Config("CHANGELOG_ENTRY_FILE"))
-
-
 class DeleteBranchRef(Step):
   MESSAGE = "Delete branch ref."
 
@@ -167,20 +109,9 @@ class MakeBranch(Step):
   def RunStep(self):
     self.Git("reset --hard origin/master")
     self.Git("new-branch work-branch --upstream origin/%s" % self["version"])
-    self.GitCheckoutFile(CHANGELOG_FILE, self["latest_version"])
     self.GitCheckoutFile(VERSION_FILE, self["latest_version"])
 
 
-class AddChangeLog(Step):
-  MESSAGE = "Add ChangeLog changes to release branch."
-
-  def RunStep(self):
-    changelog_entry = FileToText(self.Config("CHANGELOG_ENTRY_FILE"))
-    old_change_log = FileToText(os.path.join(self.default_cwd, CHANGELOG_FILE))
-    new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
-    TextToFile(new_change_log, os.path.join(self.default_cwd, CHANGELOG_FILE))
-
-
 class SetVersion(Step):
   MESSAGE = "Set correct version for candidates."
 
@@ -202,30 +133,14 @@ class EnableMergeWatchlist(Step):
 
 
 class CommitBranch(Step):
-  MESSAGE = "Commit version and changelog to new branch."
+  MESSAGE = "Commit version to new branch."
 
   def RunStep(self):
-    # Convert the ChangeLog entry to commit message format.
-    text = FileToText(self.Config("CHANGELOG_ENTRY_FILE"))
-
-    # Remove date and trailing white space.
-    text = re.sub(r"^%s: " % self["date"], "", text.rstrip())
-
-    # Remove indentation and merge paragraphs into single long lines, keeping
-    # empty lines between them.
-    def SplitMapJoin(split_text, fun, join_text):
-      return lambda text: join_text.join(map(fun, text.split(split_text)))
-    text = SplitMapJoin(
-        "\n\n", SplitMapJoin("\n", str.strip, " "), "\n\n")(text)
-
-    if not text:  # pragma: no cover
-      self.Die("Commit message editing failed.")
-    text += "\n\nTBR=%s" % self._options.reviewer
-    self["commit_title"] = text.splitlines()[0]
+    self["commit_title"] = "Version %s" % self["version"]
+    text = "%s\n\nTBR=%s" % (self["commit_title"], self._options.reviewer)
     TextToFile(text, self.Config("COMMITMSG_FILE"))
 
     self.GitCommit(file_name=self.Config("COMMITMSG_FILE"))
-    os.remove(self.Config("CHANGELOG_ENTRY_FILE"))
 
 
 class LandBranch(Step):
@@ -294,8 +209,6 @@ class CreateRelease(ScriptsBase):
   def _Config(self):
     return {
       "PERSISTFILE_BASENAME": "/tmp/create-releases-tempfile",
-      "CHANGELOG_ENTRY_FILE":
-          "/tmp/v8-create-releases-tempfile-changelog-entry",
       "COMMITMSG_FILE": "/tmp/v8-create-releases-tempfile-commitmsg",
     }
 
@@ -305,12 +218,9 @@ class CreateRelease(ScriptsBase):
       PrepareBranchRevision,
       IncrementVersion,
       DetectLastRelease,
-      PrepareChangeLog,
-      EditChangeLog,
       DeleteBranchRef,
       PushBranchRef,
       MakeBranch,
-      AddChangeLog,
       SetVersion,
       EnableMergeWatchlist,
       CommitBranch,

tools/release/merge_to_branch.py

@@ -145,7 +145,7 @@ class CreateCommitMessage(Step):
     if bug_aggregate:
       # TODO(machenbach): Use proper gerrit footer for bug after switch to
       # gerrit. Keep BUG= for now for backwards-compatibility.
-      msg_pieces.append("BUG=%s\nLOG=N\n" % bug_aggregate)
+      msg_pieces.append("BUG=%s\n" % bug_aggregate)
 
     msg_pieces.append("NOTRY=true\nNOPRESUBMIT=true\nNOTREECHECKS=true\n")
 

tools/release/roll_merge.py

@@ -129,7 +129,7 @@ class CreateCommitMessage(Step):
         bugs.extend(s.strip() for s in bug.split(","))
     bug_aggregate = ",".join(sorted(filter(lambda s: s and s != "none", bugs)))
     if bug_aggregate:
-      msg_pieces.append("BUG=%s\nLOG=N\n" % bug_aggregate)
+      msg_pieces.append("BUG=%s\n" % bug_aggregate)
 
     self["new_commit_msg"] = "".join(msg_pieces)