From 8a25cfcadcb8168a516665500cebc96ce3c01600 Mon Sep 17 00:00:00 2001
From: Shelley Vohr <shelley.vohr@gmail.com>
Date: Fri, 1 Feb 2019 18:14:19 -0800
Subject: [PATCH] Revert "fix: show proper clerk notes in release notes script
 (backport: 4-0-x) (#16678)"

This reverts commit 3f68d69c40c5480819ee4b97141ee22251c85c69.
---
 script/release-notes/notes.js | 90 +++--------------------------------
 1 file changed, 6 insertions(+), 84 deletions(-)

diff --git a/script/release-notes/notes.js b/script/release-notes/notes.js
index 652c8b73ae5f3..03c905b6742c5 100644
--- a/script/release-notes/notes.js
+++ b/script/release-notes/notes.js
@@ -64,35 +64,6 @@ const setPullRequest = (commit, owner, repo, number) => {
   }
 }
 
-const getNoteFromClerk = async (number, owner, repo) => {
-  const comments = await getComments(number, owner, repo)
-  if (!comments && !comments.data) {
-    return
-  }
-
-  const CLERK_LOGIN = 'release-clerk[bot]'
-  const PERSIST_LEAD = '**Release Notes Persisted**\n\n'
-  const QUOTE_LEAD = '> '
-
-  for (const comment of comments.data.reverse()) {
-    if (comment.user.login !== CLERK_LOGIN) {
-      continue
-    }
-    if (!comment.body.startsWith(PERSIST_LEAD)) {
-      continue
-    }
-    const note = comment.body
-      .slice(PERSIST_LEAD.length).trim() // remove PERSIST_LEAD
-      .split('\r?\n') // break into lines
-      .map(line => line.trim())
-      .filter(line => line.startsWith(QUOTE_LEAD)) // notes are quoted
-      .map(line => line.slice(QUOTE_LEAD.length)) // unquote the lines
-      .join(' ') // join the note lines
-      .trim()
-    return note
-  }
-}
-
 // copied from https://github.com/electron/clerk/blob/master/src/index.ts#L4-L13
 const OMIT_FROM_RELEASE_NOTES_KEYS = [
   'no-notes',
@@ -111,12 +82,10 @@ const getNoteFromBody = body => {
   }
 
   const NOTE_PREFIX = 'Notes: '
-  const NOTE_HEADER = '#### Release Notes'
 
   let note = body
     .split(/\r?\n\r?\n/) // split into paragraphs
     .map(paragraph => paragraph.trim())
-    .map(paragraph => paragraph.startsWith(NOTE_HEADER) ? paragraph.slice(NOTE_HEADER.length).trim() : paragraph)
     .find(paragraph => paragraph.startsWith(NOTE_PREFIX))
 
   if (note) {
@@ -217,9 +186,9 @@ const parseCommitMessage = (commitMessage, owner, repo, commit = {}) => {
 
   // https://www.conventionalcommits.org/en
   if (commitMessage
-    .split(/\r?\n/) // split into lines
-    .map(line => line.trim())
-    .some(line => line.startsWith('BREAKING CHANGE'))) {
+    .split(/\r?\n\r?\n/) // split into paragraphs
+    .map(paragraph => paragraph.trim())
+    .some(paragraph => paragraph.startsWith('BREAKING CHANGE'))) {
     commit.type = 'breaking-change'
   }
 
@@ -327,22 +296,6 @@ const getPullRequest = async (number, owner, repo) => {
   })
 }
 
-const getComments = async (number, owner, repo) => {
-  const name = `${owner}-${repo}-pull-${number}-comments`
-  return checkCache(name, async () => {
-    try {
-      return await octokit.issues.listComments({ number, owner, repo, per_page: 100 })
-    } catch (error) {
-      // Silently eat 404s.
-      // We can get a bad pull number if someone manually lists
-      // an issue number in PR number notation, e.g. 'fix: foo (#123)'
-      if (error.code !== 404) {
-        throw error
-      }
-    }
-  })
-}
-
 const addRepoToPool = async (pool, repo, from, to) => {
   const commonAncestor = await getCommonAncestor(repo.dir, from, to)
   const oldHashes = await getLocalCommitHashes(repo.dir, from)
@@ -441,28 +394,6 @@ const getDependencyCommits = async (pool, from, to) => {
     : getDependencyCommitsGN(pool, from, to)
 }
 
-// Changes are interesting if they make a change relative to a previous
-// release in the same series. For example if you fix a Y.0.0 bug, that
-// should be included in the Y.0.1 notes even if it's also tropped back
-// to X.0.1.
-//
-// The phrase 'previous release' is important: if this is the first
-// prerelease or first stable release in a series, we omit previous
-// branches' changes. Otherwise we will have an overwhelmingly long
-// list of mostly-irrelevant changes.
-const shouldIncludeMultibranchChanges = (version) => {
-  let show = true
-
-  if (semver.valid(version)) {
-    const prerelease = semver.prerelease(version)
-    show = prerelease
-      ? parseInt(prerelease.pop()) > 1
-      : semver.patch(version) > 0
-  }
-
-  return show
-}
-
 /***
 ****  Main
 ***/
@@ -515,19 +446,8 @@ const getNotes = async (fromRef, toRef, newVersion) => {
   // scrape PRs for release note 'Notes:' comments
   for (const commit of pool.commits) {
     let pr = commit.pr
-
     let prSubject
     while (pr && !commit.note) {
-      const note = await getNoteFromClerk(pr.number, pr.owner, pr.repo)
-      if (note) {
-        commit.note = note
-      }
-
-      // if we already have all the data we need, stop scraping the PRs
-      if (commit.note && commit.type && prSubject) {
-        break
-      }
-
       const prData = await getPullRequest(pr.number, pr.owner, pr.repo)
       if (!prData || !prData.data) {
         break
@@ -553,7 +473,9 @@ const getNotes = async (fromRef, toRef, newVersion) => {
     .filter(commit => commit.note !== NO_NOTES)
     .filter(commit => !((commit.note || commit.subject).match(/^[Bb]ump v\d+\.\d+\.\d+/)))
 
-  if (!shouldIncludeMultibranchChanges(newVersion)) {
+  // if this is a stable release,
+  // remove notes for changes that already landed in a previous major/minor series
+  if (semver.valid(newVersion) && !semver.prerelease(newVersion)) {
     // load all the prDatas
     await Promise.all(
       pool.commits.map(commit => new Promise(async (resolve) => {