Make v8 releases script ready for chromium git switch.

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 1176 matching lines @@
 
 Tagging version 3.27.34.7
 ------------------------------------------------------------------------
 r22627 | author4@chromium.org | 2014-07-26 01:39:15 +0200 (Sat, 26 Jul 2014)
 Changed paths:
    A /tags/3.28.40 (from /branches/bleeding_edge:22624)
 
 Tagging version 3.28.40
 ------------------------------------------------------------------------
 """
+    c_hash2_commit_log = """Revert something.
+
+BUG=12345
+
+Reason:
+> Some reason.
+> Cr-Commit-Position: refs/heads/master@{#12345}
+> git-svn-id: svn://svn.chromium.org/chrome/trunk/src@12345 003-1c4
+
+Review URL: https://codereview.chromium.org/12345
+
+Cr-Commit-Position: refs/heads/master@{#4567}
+git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4567 0039-1c4b
+
+"""
+    c_hash3_commit_log = """Simple.
+
+git-svn-id: svn://svn.chromium.org/chrome/trunk/src@3456 0039-1c4b
+
+"""
     json_output = self.MakeEmptyTempFile()
     csv_output = self.MakeEmptyTempFile()
     TEST_CONFIG[VERSION_FILE] = self.MakeEmptyTempFile()
     self.WriteFakeVersionFile()
 
     TEST_CONFIG[DOT_GIT_LOCATION] = self.MakeEmptyTempFile()
     if not os.path.exists(TEST_CONFIG[CHROMIUM]):
       os.makedirs(TEST_CONFIG[CHROMIUM])
     def WriteDEPS(revision):
       TextToFile("Line\n   \"v8_revision\": \"%s\",\n  line\n" % revision,
@@ skipping 56 matching lines @@
       Git("svn find-rev r22626", "hash_22626"),
       Git("svn find-rev hash_22626", "22626"),
       Git("log -1 --format=%ci hash_22626", "01:23"),
       Git("svn find-rev r22624", "hash_22624"),
       Git("svn find-rev hash_22624", "22624"),
       Git("log -1 --format=%ci hash_22624", "02:34"),
       Git("status -s -uno", ""),
       Git("checkout -f master", ""),
       Git("pull", ""),
       Git("checkout -b %s" % TEST_CONFIG[BRANCHNAME], ""),
-      Git("log --format=%H --grep=\"V8\"", "c_hash1\nc_hash2\n"),
+      Git("log --format=%H --grep=\"V8\"", "c_hash1\nc_hash2\nc_hash3\n"),
       Git("diff --name-only c_hash1 c_hash1^", ""),
       Git("diff --name-only c_hash2 c_hash2^", TEST_CONFIG[DEPS_FILE]),
       Git("checkout -f c_hash2 -- %s" % TEST_CONFIG[DEPS_FILE], "",
+          cb=ResetDEPS(22624)),
+      Git("log -1 --format=%B c_hash2", c_hash2_commit_log),
+      Git("diff --name-only c_hash3 c_hash3^", TEST_CONFIG[DEPS_FILE]),
+      Git("checkout -f c_hash3 -- %s" % TEST_CONFIG[DEPS_FILE], "",
           cb=ResetDEPS(345)),
-      Git("svn find-rev c_hash2", "4567"),
+      Git("log -1 --format=%B c_hash3", c_hash3_commit_log),
       Git("checkout -f HEAD -- %s" % TEST_CONFIG[DEPS_FILE], "",
           cb=ResetDEPS(567)),
       Git("branch -r", " weird/123\n  branch-heads/7\n"),
       Git("checkout -f branch-heads/7 -- %s" % TEST_CONFIG[DEPS_FILE], "",
           cb=ResetDEPS(345)),
       Git("checkout -f HEAD -- %s" % TEST_CONFIG[DEPS_FILE], "",
           cb=ResetDEPS(567)),
       Git("checkout -f master", ""),
       Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
       Git("checkout -f some_branch", ""),
       Git("branch -D %s" % TEST_CONFIG[BRANCHNAME], ""),
     ])
 
     args = ["-c", TEST_CONFIG[CHROMIUM],
             "--json", json_output,
             "--csv", csv_output,
             "--max-releases", "1"]
     Releases(TEST_CONFIG, self).Run(args)
 
     # Check expected output.
     csv = ("3.28.41,bleeding_edge,22626,,\r\n"
-           "3.28.40,bleeding_edge,22624,,\r\n"
-           "3.22.3,trunk,345,4567,\r\n"
+           "3.28.40,bleeding_edge,22624,4567,\r\n"
+           "3.22.3,trunk,345,3456:4566,\r\n"
            "3.21.2,3.21,123,,\r\n"
            "3.3.1.1,3.3,234,,12\r\n")
     self.assertEquals(csv, FileToText(csv_output))
 
     expected_json = [
       {"bleeding_edge": "22626", "patches_merged": "", "version": "3.28.41",
        "chromium_revision": "", "branch": "bleeding_edge", "revision": "22626",
        "review_link": "", "date": "01:23", "chromium_branch": "",
        "revision_link": "https://code.google.com/p/v8/source/detail?r=22626"},
       {"bleeding_edge": "22624", "patches_merged": "", "version": "3.28.40",
-       "chromium_revision": "", "branch": "bleeding_edge", "revision": "22624",
-       "review_link": "", "date": "02:34", "chromium_branch": "",
+       "chromium_revision": "4567", "branch": "bleeding_edge",
+       "revision": "22624", "review_link": "", "date": "02:34",
+       "chromium_branch": "",
        "revision_link": "https://code.google.com/p/v8/source/detail?r=22624"},
       {"bleeding_edge": "", "patches_merged": "", "version": "3.22.3",
-       "chromium_revision": "4567", "branch": "trunk", "revision": "345",
+       "chromium_revision": "3456:4566", "branch": "trunk", "revision": "345",
        "review_link": "", "date": "", "chromium_branch": "7",
        "revision_link": "https://code.google.com/p/v8/source/detail?r=345"},
       {"patches_merged": "", "bleeding_edge": "", "version": "3.21.2",
        "chromium_revision": "", "branch": "3.21", "revision": "123",
        "review_link": "", "date": "03:15", "chromium_branch": "",
        "revision_link": "https://code.google.com/p/v8/source/detail?r=123"},
       {"patches_merged": "12", "bleeding_edge": "", "version": "3.3.1.1",
        "chromium_revision": "", "branch": "3.3", "revision": "234",
        "review_link": "fake.com", "date": "18:15", "chromium_branch": "",
        "revision_link": "https://code.google.com/p/v8/source/detail?r=234"},
@@ skipping 154 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)