Revert "Maintain change log file directly on trunk branch in push-to-trunk." and related changes.

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 249 matching lines @@
     self.GitCheckout("svn/bleeding_edge")
     self["prepare_commit_hash"] = self.GitLog(n=1, format="%H",
                                               grep=self["prep_commit_msg"])
 
 
 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. Exclude the ChangeLog file. It is not
-    # maintained on bleeding edge. Changes will be added in a separate step
-    # below.
-    TextToFile(self.GitDiff("svn/trunk",
-                            self["prepare_commit_hash"],
-                            exclude=[self.Config(CHANGELOG_FILE)]),
+    # that's easier to automate.
+    TextToFile(self.GitDiff("svn/trunk", self["prepare_commit_hash"]),
                self.Config(PATCH_FILE))
 
     # 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())
 
     # Retrieve svn revision for showing the used bleeding edge revision in the
     # commit message.
@@ skipping 22 matching lines @@
 
 
 class ApplyChanges(Step):
   MESSAGE = "Apply squashed changes."
 
   def RunStep(self):
     self.ApplyPatch(self.Config(PATCH_FILE))
     Command("rm", "-f %s*" % self.Config(PATCH_FILE))
 
 
-class AddChangeLog(Step):
-  MESSAGE = "Add ChangeLog changes to trunk branch."
-
-  def RunStep(self):
-    changelog_entry = FileToText(self.Config(NEW_CHANGELOG_FILE))
-    old_change_log = FileToText(self.Config(CHANGELOG_FILE))
-    new_change_log = "%s\n\n\n%s" % (changelog_entry, old_change_log)
-    TextToFile(new_change_log, self.Config(CHANGELOG_FILE))
-    os.remove(self.Config(NEW_CHANGELOG_FILE))
-
 class SetVersion(Step):
   MESSAGE = "Set correct version for trunk."
 
   def RunStep(self):
     output = ""
     for line in FileToText(self.Config(VERSION_FILE)).splitlines():
       if line.startswith("#define MAJOR_VERSION"):
         line = re.sub("\d+$", self["major"], line)
       elif line.startswith("#define MINOR_VERSION"):
         line = re.sub("\d+$", self["minor"], line)
@@ skipping 198 matching lines @@
       PrepareChangeLog,
       EditChangeLog,
       IncrementVersion,
       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())