[Release] Update merge script to leverage auto-tag bot

tools/release/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 1139 matching lines @@
     TEST_CONFIG["ALREADY_MERGING_SENTINEL_FILE"] = self.MakeEmptyTempFile()
     TextToFile("", os.path.join(TEST_CONFIG["DEFAULT_CWD"], ".git"))
     self.WriteFakeVersionFile(build=5)
     os.environ["EDITOR"] = "vi"
     extra_patch = self.MakeEmptyTempFile()
 
     def VerifyPatch(patch):
       return lambda: self.assertEquals(patch,
           FileToText(TEST_CONFIG["TEMPORARY_PATCH_FILE"]))
 
-    msg = """Version 3.22.5.1 (cherry-pick)
+    msg = """Merged: Squashed multiple commits.
 
-Merged ab12345
-Merged ab23456
-Merged ab34567
-Merged ab45678
-Merged ab56789
+Merged: Title4
+Hash: ab12345
 
-Title4
+Merged: Title2
+Hash: ab23456
 
-Title2
+Merged: Title3
+Hash: ab34567
 
-Title3
+Merged: Title1
+Hash: ab45678
 
-Title1
-
-Revert "Something"
+Merged: Revert \"Something\"
+Hash: ab56789
 
 BUG=123,234,345,456,567,v8:123
 LOG=N
 """
 
     def VerifyLand():
       commit = FileToText(TEST_CONFIG["COMMITMSG_FILE"])
       self.assertEquals(msg, commit)
-      version = FileToText(
-          os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE))
-      self.assertTrue(re.search(r"#define V8_MINOR_VERSION\s+22", version))
-      self.assertTrue(re.search(r"#define V8_BUILD_NUMBER\s+5", version))
-      self.assertTrue(re.search(r"#define V8_PATCH_LEVEL\s+1", version))
-      self.assertTrue(
-          re.search(r"#define V8_IS_CANDIDATE_VERSION\s+0", version))
 
     self.Expect([
       Cmd("git status -s -uno", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git fetch", ""),
       Cmd("git branch", "  branch1\n* branch2\n"),
       Cmd("git new-branch %s --upstream refs/remotes/origin/candidates" %
           TEST_CONFIG["BRANCHNAME"], ""),
-      Cmd(("git log --format=%H --grep=\"Port ab12345\" "
+      Cmd(("git log --format=%H --grep=\"^[P,p]ort ab12345\" "
            "--reverse origin/master"),
           "ab45678\nab23456"),
       Cmd("git log -1 --format=%s ab45678", "Title1"),
       Cmd("git log -1 --format=%s ab23456", "Title2"),
-      Cmd(("git log --format=%H --grep=\"Port ab23456\" "
+      Cmd(("git log --format=%H --grep=\"^[P,p]ort ab23456\" "
            "--reverse origin/master"),
           ""),
-      Cmd(("git log --format=%H --grep=\"Port ab34567\" "
+      Cmd(("git log --format=%H --grep=\"^[P,p]ort ab34567\" "
            "--reverse origin/master"),
           "ab56789"),
       Cmd("git log -1 --format=%s ab56789", "Title3"),
       RL("Y"),  # Automatically add corresponding ports (ab34567, ab56789)?
       # Simulate git being down which stops the script.
       Cmd("git log -1 --format=%s ab12345", None),
       # Restart script in the failing step.
       Cmd("git log -1 --format=%s ab12345", "Title4"),
       Cmd("git log -1 --format=%s ab23456", "Title2"),
       Cmd("git log -1 --format=%s ab34567", "Title3"),
@@ skipping 18 matching lines @@
           "", cb=VerifyPatch("patch3")),
       Cmd("git log -1 -p ab45678", "patch1"),
       Cmd(("git apply --index --reject \"%s\"" %
            TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch1")),
       Cmd("git log -1 -p ab56789", "patch5\n"),
       Cmd(("git apply --index --reject \"%s\"" %
            TEST_CONFIG["TEMPORARY_PATCH_FILE"]),
           "", cb=VerifyPatch("patch5\n")),
       Cmd("git apply --index --reject \"%s\"" % extra_patch, ""),
-      RL("Y"),  # Automatically increment patch level?
       Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], ""),
       RL("reviewer@chromium.org"),  # V8 reviewer.
       Cmd("git cl upload --send-mail -r \"reviewer@chromium.org\" "
           "--bypass-hooks --cc \"ulan@chromium.org\"", ""),
       Cmd("git checkout -f %s" % TEST_CONFIG["BRANCHNAME"], ""),
       RL("LGTM"),  # Enter LGTM for V8 CL.
       Cmd("git cl presubmit", "Presubmit successfull\n"),
       Cmd("git cl land -f --bypass-hooks", "Closing issue\n",
           cb=VerifyLand),
-      Cmd("git fetch", ""),
-      Cmd("git log -1 --format=%H --grep=\""
-          "Version 3.22.5.1 (cherry-pick)"
-          "\" refs/remotes/origin/candidates",
-          ""),
-      Cmd("git fetch", ""),
-      Cmd("git log -1 --format=%H --grep=\""
-          "Version 3.22.5.1 (cherry-pick)"
-          "\" refs/remotes/origin/candidates",
-          "hsh_to_tag"),
-      Cmd("git tag 3.22.5.1 hsh_to_tag", ""),
-      Cmd("git push origin 3.22.5.1", ""),
       Cmd("git checkout -f origin/master", ""),
       Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""),
     ])
 
     # ab12345 and ab34567 are patches. ab23456 (included) and ab45678 are the
     # MIPS ports of ab12345. ab56789 is the MIPS port of ab34567.
     args = ["-f", "-p", extra_patch, "--branch", "candidates",
             "ab12345", "ab23456", "ab34567"]
 
     # The first run of the script stops because of git being down.
@@ skipping 267 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)