Revert of Version 4.9.385.17 (cherry-pick)

tools/release/create_release.py

 #!/usr/bin/env python
 # Copyright 2015 the V8 project authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import argparse
 import os
 import sys
 import tempfile
 import urllib2
 
 from common_includes import *
 
+
 class Preparation(Step):
   MESSAGE = "Preparation."
 
   def RunStep(self):
     fetchspecs = [
       "+refs/heads/*:refs/heads/*",
       "+refs/pending/*:refs/pending/*",
       "+refs/pending-tags/*:refs/pending-tags/*",
     ]
     self.Git("fetch origin %s" % " ".join(fetchspecs))
@@ skipping 132 matching lines @@
 
 
 class MakeBranch(Step):
   MESSAGE = "Create the branch."
 
   def RunStep(self):
     self.Git("reset --hard origin/master")
     self.Git("checkout -b work-branch %s" % self["push_hash"])
     self.GitCheckoutFile(CHANGELOG_FILE, self["latest_version"])
     self.GitCheckoutFile(VERSION_FILE, self["latest_version"])
-    self.GitCheckoutFile(WATCHLISTS_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."
 
   def RunStep(self):
     self.SetVersion(os.path.join(self.default_cwd, VERSION_FILE), "new_")
 
 
-class EnableMergeWatchlist(Step):
-  MESSAGE = "Enable watchlist entry for merge notifications."
-
-  def RunStep(self):
-    old_watchlist_content = FileToText(os.path.join(self.default_cwd,
-                                                    WATCHLISTS_FILE))
-    new_watchlist_content = re.sub("(# 'v8-merges@googlegroups\.com',)",
-                                   "'v8-merges@googlegroups.com',",
-                                   old_watchlist_content)
-    TextToFile(new_watchlist_content, os.path.join(self.default_cwd,
-                                                   WATCHLISTS_FILE))
-
-
 class CommitBranch(Step):
   MESSAGE = "Commit version and changelog 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())
 
@@ skipping 85 matching lines @@
     return [
       Preparation,
       PrepareBranchRevision,
       IncrementVersion,
       DetectLastRelease,
       PrepareChangeLog,
       EditChangeLog,
       MakeBranch,
       AddChangeLog,
       SetVersion,
-      EnableMergeWatchlist,
       CommitBranch,
       PushBranch,
       TagRevision,
       CleanUp,
     ]
 
 
 if __name__ == "__main__":  # pragma: no cover
   sys.exit(CreateRelease().Run())