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

tools/push-to-trunk/test_scripts.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 571 matching lines @@
 
     cl = GetLastChangeLogEntries(TEST_CONFIG[CHANGELOG_FILE])
     self.assertEquals(cl_chunk, cl)
 
   def _TestSquashCommits(self, change_log, expected_msg):
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
     with open(TEST_CONFIG[CHANGELOG_ENTRY_FILE], "w") as f:
       f.write(change_log)
 
     self.ExpectGit([
-      Git("diff --name-only svn/trunk hash1", "file1\nfile2\n"),
-      Git("diff svn/trunk hash1 file1 file2", "patch content"),
+      Git("diff svn/trunk hash1", "patch content"),
       Git("svn find-rev hash1", "123455\n"),
     ])
 
     self._state["prepare_commit_hash"] = "hash1"
     self._state["date"] = "1999-11-11"
 
     self.RunStep(PushToTrunk, SquashCommits)
     self.assertEquals(FileToText(TEST_CONFIG[COMMITMSG_FILE]), expected_msg)
 
     patch = FileToText(TEST_CONFIG[ PATCH_FILE])
@@ skipping 32 matching lines @@
     commit_msg = """Line with "quotation marks"."""
     self._TestSquashCommits(change_log, commit_msg)
 
   def _PushToTrunk(self, force=False, manual=False):
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     TEST_CONFIG[VERSION_FILE] = self.MakeTempVersionFile()
     TEST_CONFIG[CHANGELOG_ENTRY_FILE] = self.MakeEmptyTempFile()
     TEST_CONFIG[CHANGELOG_FILE] = self.MakeEmptyTempFile()
     if not os.path.exists(TEST_CONFIG[CHROMIUM]):
       os.makedirs(TEST_CONFIG[CHROMIUM])
-    old_change_log = """1999-04-05: Version 3.22.4
-
-        Performance and stability improvements on all platforms.\n"""
-    TextToFile(old_change_log, TEST_CONFIG[CHANGELOG_FILE])
+    TextToFile("1999-04-05: Version 3.22.4", TEST_CONFIG[CHANGELOG_FILE])
     TextToFile("Some line\n   \"v8_revision\": \"123444\",\n  some line",
                  TEST_CONFIG[DEPS_FILE])
     os.environ["EDITOR"] = "vi"
 
     def CheckPreparePush():
       cl = FileToText(TEST_CONFIG[CHANGELOG_FILE])
       self.assertTrue(re.search(r"Version 3.22.5", cl))
       self.assertTrue(re.search(r"        Log text 1 \(issue 321\).", cl))
       self.assertFalse(re.search(r"        \(author1@chromium\.org\)", cl))
 
       # Make sure all comments got stripped.
       self.assertFalse(re.search(r"^#", cl, flags=re.M))
 
       version = FileToText(TEST_CONFIG[VERSION_FILE])
       self.assertTrue(re.search(r"#define BUILD_NUMBER\s+6", version))
 
-    def TrunkBranchSideEffects():
-      """On 'git co -b new_branch svn/trunk', the ChangLog will be reset to its
-      original content."""
-      TextToFile(old_change_log, TEST_CONFIG[CHANGELOG_FILE])
-
     def CheckSVNCommit():
       commit = FileToText(TEST_CONFIG[COMMITMSG_FILE])
       self.assertEquals(
 """Version 3.22.5 (based on bleeding_edge revision r123455)
 
 Log text 1 (issue 321).
 
 Performance and stability improvements on all platforms.""", commit)
       version = FileToText(TEST_CONFIG[VERSION_FILE])
       self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version))
       self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version))
       self.assertFalse(re.search(r"#define BUILD_NUMBER\s+6", version))
       self.assertTrue(re.search(r"#define PATCH_LEVEL\s+0", version))
       self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version))
 
-      # Check that the change log on the trunk branch got correctly modified.
-      change_log = FileToText(TEST_CONFIG[CHANGELOG_FILE])
-      self.assertEquals(
-"""1999-07-31: Version 3.22.5
-
-        Log text 1 (issue 321).
-
-        Performance and stability improvements on all platforms.
-
-
-1999-04-05: Version 3.22.4
-
-        Performance and stability improvements on all platforms.\n""",
-          change_log)
-
     force_flag = " -f" if not manual else ""
     review_suffix = "\n\nTBR=reviewer@chromium.org" if not manual else ""
     self.ExpectGit([
       Git("status -s -uno", ""),
       Git("status -s -b -uno", "## some_branch\n"),
       Git("svn fetch", ""),
       Git("branch", "  branch1\n* branch2\n"),
       Git("checkout -b %s" % TEST_CONFIG[TEMP_BRANCH], ""),
       Git("branch", "  branch1\n* branch2\n"),
       Git("branch", "  branch1\n* branch2\n"),
@@ skipping 16 matching lines @@
       Git(("cl upload --send-mail --email \"author@chromium.org\" "
            "-r \"reviewer@chromium.org\"%s" % force_flag),
           "done\n"),
       Git("cl presubmit", "Presubmit successfull\n"),
       Git("cl dcommit -f --bypass-hooks", "Closing issue\n"),
       Git("svn fetch", "fetch result\n"),
       Git("checkout -f svn/bleeding_edge", ""),
       Git(("log -1 --format=%H --grep=\"Prepare push to trunk.  "
            "Now working on version 3.22.6.\""),
           "hash1\n"),
-      # The ChangeLog file will be one of the files with differences between
-      # trunk and bleeding edge.
-      Git("diff --name-only svn/trunk hash1",
-          "file1\n%s\nfile2\n" % TEST_CONFIG[CHANGELOG_FILE]),
-      Git("diff svn/trunk hash1 file1 file2", "patch content"),
+      Git("diff svn/trunk hash1", "patch content\n"),
       Git("svn find-rev hash1", "123455\n"),
-      Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], "",
-          cb=TrunkBranchSideEffects),
+      Git("checkout -b %s svn/trunk" % TEST_CONFIG[TRUNKBRANCH], ""),
       Git("apply --index --reject \"%s\"" % TEST_CONFIG[PATCH_FILE], ""),
       Git("add \"%s\"" % TEST_CONFIG[VERSION_FILE], ""),
       Git("commit -aF \"%s\"" % TEST_CONFIG[COMMITMSG_FILE], "",
           cb=CheckSVNCommit),
       Git("svn dcommit 2>&1", "Some output\nCommitted r123456\nSome output\n"),
       Git("svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""),
       Git("status -s -uno", ""),
       Git("checkout -f master", ""),
       Git("pull", ""),
       Git("checkout -b v8-roll-123456", ""),
@@ skipping 287 matching lines @@
 
 Review URL: https://codereview.chromium.org/83173002
 
 ------------------------------------------------------------------------""")
     self.assertEquals(
 """Prepare push to trunk.  Now working on version 3.23.11.
 
 R=danno@chromium.org
 
 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body)