OLD | NEW |
1 #!/usr/bin/env python | 1 #!/usr/bin/env python |
2 # Copyright 2013 the V8 project authors. All rights reserved. | 2 # Copyright 2013 the V8 project authors. All rights reserved. |
3 # Redistribution and use in source and binary forms, with or without | 3 # Redistribution and use in source and binary forms, with or without |
4 # modification, are permitted provided that the following conditions are | 4 # modification, are permitted provided that the following conditions are |
5 # met: | 5 # met: |
6 # | 6 # |
7 # * Redistributions of source code must retain the above copyright | 7 # * Redistributions of source code must retain the above copyright |
8 # notice, this list of conditions and the following disclaimer. | 8 # notice, this list of conditions and the following disclaimer. |
9 # * Redistributions in binary form must reproduce the above | 9 # * Redistributions in binary form must reproduce the above |
10 # copyright notice, this list of conditions and the following | 10 # copyright notice, this list of conditions and the following |
(...skipping 743 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
754 force_flag = " -f" if not manual else "" | 754 force_flag = " -f" if not manual else "" |
755 expectations = [] | 755 expectations = [] |
756 if not force: | 756 if not force: |
757 expectations.append(Cmd("which vi", "/usr/bin/vi")) | 757 expectations.append(Cmd("which vi", "/usr/bin/vi")) |
758 expectations += [ | 758 expectations += [ |
759 Cmd("git status -s -uno", ""), | 759 Cmd("git status -s -uno", ""), |
760 Cmd("git status -s -b -uno", "## some_branch\n"), | 760 Cmd("git status -s -b -uno", "## some_branch\n"), |
761 Cmd("git svn fetch", ""), | 761 Cmd("git svn fetch", ""), |
762 Cmd("git branch", " branch1\n* branch2\n"), | 762 Cmd("git branch", " branch1\n* branch2\n"), |
763 Cmd("git branch", " branch1\n* branch2\n"), | 763 Cmd("git branch", " branch1\n* branch2\n"), |
764 Cmd("git checkout -b %s svn/bleeding_edge" % TEST_CONFIG["BRANCHNAME"], | 764 Cmd(("git new-branch %s --upstream svn/bleeding_edge" % |
| 765 TEST_CONFIG["BRANCHNAME"]), |
765 ""), | 766 ""), |
766 Cmd("git svn find-rev r123455", "push_hash\n"), | 767 Cmd("git svn find-rev r123455", "push_hash\n"), |
767 Cmd(("git log -1 --format=%H --grep=" | 768 Cmd(("git log -1 --format=%H --grep=" |
768 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " | 769 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " |
769 "svn/trunk"), "hash2\n"), | 770 "svn/trunk"), "hash2\n"), |
770 Cmd("git log -1 hash2", "Log message\n"), | 771 Cmd("git log -1 hash2", "Log message\n"), |
771 ] | 772 ] |
772 if manual: | 773 if manual: |
773 expectations.append(RL("Y")) # Confirm last push. | 774 expectations.append(RL("Y")) # Confirm last push. |
774 expectations += [ | 775 expectations += [ |
(...skipping 16 matching lines...) Expand all Loading... |
791 if manual: | 792 if manual: |
792 expectations.append(RL("")) # Open editor. | 793 expectations.append(RL("")) # Open editor. |
793 if not force: | 794 if not force: |
794 expectations.append( | 795 expectations.append( |
795 Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], "")) | 796 Cmd("vi %s" % TEST_CONFIG["CHANGELOG_ENTRY_FILE"], "")) |
796 expectations += [ | 797 expectations += [ |
797 Cmd("git svn fetch", "fetch result\n"), | 798 Cmd("git svn fetch", "fetch result\n"), |
798 Cmd("git checkout -f svn/bleeding_edge", ""), | 799 Cmd("git checkout -f svn/bleeding_edge", ""), |
799 Cmd("git diff svn/trunk push_hash", "patch content\n"), | 800 Cmd("git diff svn/trunk push_hash", "patch content\n"), |
800 Cmd("git svn find-rev push_hash", "123455\n"), | 801 Cmd("git svn find-rev push_hash", "123455\n"), |
801 Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG["TRUNKBRANCH"], "", | 802 Cmd(("git new-branch %s --upstream svn/trunk" % |
802 cb=ResetToTrunk), | 803 TEST_CONFIG["TRUNKBRANCH"]), "", cb=ResetToTrunk), |
803 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), | 804 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), |
804 Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG["CHANGELOG_FILE"], "", | 805 Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG["CHANGELOG_FILE"], "", |
805 cb=ResetChangeLog), | 806 cb=ResetChangeLog), |
806 Cmd("git checkout -f svn/trunk -- src/version.cc", "", | 807 Cmd("git checkout -f svn/trunk -- src/version.cc", "", |
807 cb=self.WriteFakeVersionFile), | 808 cb=self.WriteFakeVersionFile), |
808 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", | 809 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", |
809 cb=CheckSVNCommit), | 810 cb=CheckSVNCommit), |
810 ] | 811 ] |
811 if manual: | 812 if manual: |
812 expectations.append(RL("Y")) # Sanity check. | 813 expectations.append(RL("Y")) # Sanity check. |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
901 Performance and stability improvements on all platforms.\n""", | 902 Performance and stability improvements on all platforms.\n""", |
902 change_log) | 903 change_log) |
903 | 904 |
904 expectations = [ | 905 expectations = [ |
905 Cmd("git status -s -uno", ""), | 906 Cmd("git status -s -uno", ""), |
906 Cmd("git status -s -b -uno", "## some_branch\n"), | 907 Cmd("git status -s -b -uno", "## some_branch\n"), |
907 Cmd("git fetch", ""), | 908 Cmd("git fetch", ""), |
908 Cmd("git svn fetch", ""), | 909 Cmd("git svn fetch", ""), |
909 Cmd("git branch", " branch1\n* branch2\n"), | 910 Cmd("git branch", " branch1\n* branch2\n"), |
910 Cmd("git branch", " branch1\n* branch2\n"), | 911 Cmd("git branch", " branch1\n* branch2\n"), |
911 Cmd("git checkout -b %s origin/master" % TEST_CONFIG["BRANCHNAME"], | 912 Cmd(("git new-branch %s --upstream origin/master" % |
| 913 TEST_CONFIG["BRANCHNAME"]), |
912 ""), | 914 ""), |
913 Cmd("git svn find-rev r123455", "push_hash\n"), | 915 Cmd("git svn find-rev r123455", "push_hash\n"), |
914 Cmd(("git log -1 --format=%H --grep=" | 916 Cmd(("git log -1 --format=%H --grep=" |
915 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " | 917 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " |
916 "origin/candidates"), "hash2\n"), | 918 "origin/candidates"), "hash2\n"), |
917 Cmd("git log -1 hash2", "Log message\n"), | 919 Cmd("git log -1 hash2", "Log message\n"), |
918 Cmd("git log -1 --format=%s hash2", | 920 Cmd("git log -1 --format=%s hash2", |
919 "Version 3.4.5 (based on bleeding_edge revision r1234)\n"), | 921 "Version 3.4.5 (based on bleeding_edge revision r1234)\n"), |
920 Cmd("git svn find-rev r1234", "hash3\n"), | 922 Cmd("git svn find-rev r1234", "hash3\n"), |
921 Cmd("git checkout -f origin/master -- src/version.cc", | 923 Cmd("git checkout -f origin/master -- src/version.cc", |
922 "", cb=self.WriteFakeVersionFile), | 924 "", cb=self.WriteFakeVersionFile), |
923 Cmd("git checkout -f hash2 -- src/version.cc", "", | 925 Cmd("git checkout -f hash2 -- src/version.cc", "", |
924 cb=self.WriteFakeVersionFile), | 926 cb=self.WriteFakeVersionFile), |
925 Cmd("git log --format=%H hash3..push_hash", "rev1\n"), | 927 Cmd("git log --format=%H hash3..push_hash", "rev1\n"), |
926 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), | 928 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), |
927 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), | 929 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), |
928 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), | 930 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), |
929 Cmd("git fetch", "fetch result\n"), | 931 Cmd("git fetch", "fetch result\n"), |
930 Cmd("git svn fetch", ""), | 932 Cmd("git svn fetch", ""), |
931 Cmd("git checkout -f origin/master", ""), | 933 Cmd("git checkout -f origin/master", ""), |
932 Cmd("git diff origin/candidates push_hash", "patch content\n"), | 934 Cmd("git diff origin/candidates push_hash", "patch content\n"), |
933 Cmd("git svn find-rev push_hash", "123455\n"), | 935 Cmd("git svn find-rev push_hash", "123455\n"), |
934 Cmd("git checkout -b %s origin/candidates" % TEST_CONFIG["TRUNKBRANCH"], | 936 Cmd(("git new-branch %s --upstream origin/candidates" % |
| 937 TEST_CONFIG["TRUNKBRANCH"]), |
935 "", cb=ResetToTrunk), | 938 "", cb=ResetToTrunk), |
936 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), | 939 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), |
937 Cmd("git checkout -f origin/candidates -- %s" % | 940 Cmd("git checkout -f origin/candidates -- %s" % |
938 TEST_CONFIG["CHANGELOG_FILE"], "", cb=ResetChangeLog), | 941 TEST_CONFIG["CHANGELOG_FILE"], "", cb=ResetChangeLog), |
939 Cmd("git checkout -f origin/candidates -- src/version.cc", "", | 942 Cmd("git checkout -f origin/candidates -- src/version.cc", "", |
940 cb=self.WriteFakeVersionFile), | 943 cb=self.WriteFakeVersionFile), |
941 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", | 944 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", |
942 cb=CheckSVNCommit), | 945 cb=CheckSVNCommit), |
943 Cmd("git svn dcommit 2>&1", ""), | 946 Cmd("git svn dcommit 2>&1", ""), |
944 Cmd("git fetch", ""), | 947 Cmd("git fetch", ""), |
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1014 "origin/candidates"), "push_hash\n"), | 1017 "origin/candidates"), "push_hash\n"), |
1015 Cmd("git log -1 --format=%s push_hash", | 1018 Cmd("git log -1 --format=%s push_hash", |
1016 "Version 3.22.5 (based on bleeding_edge revision r22622)\n"), | 1019 "Version 3.22.5 (based on bleeding_edge revision r22622)\n"), |
1017 URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js", | 1020 URL("https://chromium-build.appspot.com/p/chromium/sheriff_v8.js", |
1018 "document.write('g_name')"), | 1021 "document.write('g_name')"), |
1019 Cmd("git status -s -uno", "", cwd=chrome_dir), | 1022 Cmd("git status -s -uno", "", cwd=chrome_dir), |
1020 Cmd("git checkout -f master", "", cwd=chrome_dir), | 1023 Cmd("git checkout -f master", "", cwd=chrome_dir), |
1021 Cmd("gclient sync --nohooks", "syncing...", cwd=chrome_dir), | 1024 Cmd("gclient sync --nohooks", "syncing...", cwd=chrome_dir), |
1022 Cmd("git pull", "", cwd=chrome_dir), | 1025 Cmd("git pull", "", cwd=chrome_dir), |
1023 Cmd("git fetch origin", ""), | 1026 Cmd("git fetch origin", ""), |
1024 Cmd("git checkout -b v8-roll-push_hash", "", cwd=chrome_dir), | 1027 Cmd("git new-branch v8-roll-push_hash", "", cwd=chrome_dir), |
1025 Cmd("roll-dep v8 push_hash", "rolled", cb=WriteDeps, cwd=chrome_dir), | 1028 Cmd("roll-dep v8 push_hash", "rolled", cb=WriteDeps, cwd=chrome_dir), |
1026 Cmd(("git commit -am \"Update V8 to version 3.22.5 " | 1029 Cmd(("git commit -am \"Update V8 to version 3.22.5 " |
1027 "(based on bleeding_edge revision r22622).\n\n" | 1030 "(based on bleeding_edge revision r22622).\n\n" |
1028 "Please reply to the V8 sheriff c_name@chromium.org in " | 1031 "Please reply to the V8 sheriff c_name@chromium.org in " |
1029 "case of problems.\n\nTBR=c_name@chromium.org\" " | 1032 "case of problems.\n\nTBR=c_name@chromium.org\" " |
1030 "--author \"author@chromium.org <author@chromium.org>\""), | 1033 "--author \"author@chromium.org <author@chromium.org>\""), |
1031 "", cwd=chrome_dir), | 1034 "", cwd=chrome_dir), |
1032 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f", "", | 1035 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f", "", |
1033 cwd=chrome_dir), | 1036 cwd=chrome_dir), |
1034 ] | 1037 ] |
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1216 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version)) | 1219 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version)) |
1217 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) | 1220 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) |
1218 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) | 1221 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) |
1219 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) | 1222 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) |
1220 | 1223 |
1221 self.Expect([ | 1224 self.Expect([ |
1222 Cmd("git status -s -uno", ""), | 1225 Cmd("git status -s -uno", ""), |
1223 Cmd("git status -s -b -uno", "## some_branch\n"), | 1226 Cmd("git status -s -b -uno", "## some_branch\n"), |
1224 Cmd("git svn fetch", ""), | 1227 Cmd("git svn fetch", ""), |
1225 Cmd("git branch", " branch1\n* branch2\n"), | 1228 Cmd("git branch", " branch1\n* branch2\n"), |
1226 Cmd("git checkout -b %s svn/trunk" % TEST_CONFIG["BRANCHNAME"], ""), | 1229 Cmd("git new-branch %s --upstream svn/trunk" % TEST_CONFIG["BRANCHNAME"], |
| 1230 ""), |
1227 Cmd(("git log --format=%H --grep=\"Port r12345\" " | 1231 Cmd(("git log --format=%H --grep=\"Port r12345\" " |
1228 "--reverse svn/bleeding_edge"), | 1232 "--reverse svn/bleeding_edge"), |
1229 "hash1\nhash2"), | 1233 "hash1\nhash2"), |
1230 Cmd("git svn find-rev hash1 svn/bleeding_edge", "45678"), | 1234 Cmd("git svn find-rev hash1 svn/bleeding_edge", "45678"), |
1231 Cmd("git log -1 --format=%s hash1", "Title1"), | 1235 Cmd("git log -1 --format=%s hash1", "Title1"), |
1232 Cmd("git svn find-rev hash2 svn/bleeding_edge", "23456"), | 1236 Cmd("git svn find-rev hash2 svn/bleeding_edge", "23456"), |
1233 Cmd("git log -1 --format=%s hash2", "Title2"), | 1237 Cmd("git log -1 --format=%s hash2", "Title2"), |
1234 Cmd(("git log --format=%H --grep=\"Port r23456\" " | 1238 Cmd(("git log --format=%H --grep=\"Port r23456\" " |
1235 "--reverse svn/bleeding_edge"), | 1239 "--reverse svn/bleeding_edge"), |
1236 ""), | 1240 ""), |
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1346 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) | 1350 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) |
1347 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) | 1351 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) |
1348 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) | 1352 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) |
1349 | 1353 |
1350 self.Expect([ | 1354 self.Expect([ |
1351 Cmd("git status -s -uno", ""), | 1355 Cmd("git status -s -uno", ""), |
1352 Cmd("git status -s -b -uno", "## some_branch\n"), | 1356 Cmd("git status -s -b -uno", "## some_branch\n"), |
1353 Cmd("git fetch", ""), | 1357 Cmd("git fetch", ""), |
1354 Cmd("git svn fetch", ""), | 1358 Cmd("git svn fetch", ""), |
1355 Cmd("git branch", " branch1\n* branch2\n"), | 1359 Cmd("git branch", " branch1\n* branch2\n"), |
1356 Cmd("git checkout -b %s origin/candidates" % | 1360 Cmd("git new-branch %s --upstream origin/candidates" % |
1357 TEST_CONFIG["BRANCHNAME"], ""), | 1361 TEST_CONFIG["BRANCHNAME"], ""), |
1358 Cmd(("git log --format=%H --grep=\"Port r12345\" " | 1362 Cmd(("git log --format=%H --grep=\"Port r12345\" " |
1359 "--reverse origin/master"), | 1363 "--reverse origin/master"), |
1360 "hash1\nhash2"), | 1364 "hash1\nhash2"), |
1361 Cmd("git svn find-rev hash1 origin/master", "45678"), | 1365 Cmd("git svn find-rev hash1 origin/master", "45678"), |
1362 Cmd("git log -1 --format=%s hash1", "Title1"), | 1366 Cmd("git log -1 --format=%s hash1", "Title1"), |
1363 Cmd("git svn find-rev hash2 origin/master", "23456"), | 1367 Cmd("git svn find-rev hash2 origin/master", "23456"), |
1364 Cmd("git log -1 --format=%s hash2", "Title2"), | 1368 Cmd("git log -1 --format=%s hash2", "Title2"), |
1365 Cmd(("git log --format=%H --grep=\"Port r23456\" " | 1369 Cmd(("git log --format=%H --grep=\"Port r23456\" " |
1366 "--reverse origin/master"), | 1370 "--reverse origin/master"), |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1519 | 1523 |
1520 def ResetDEPS(revision): | 1524 def ResetDEPS(revision): |
1521 return lambda: WriteDEPS(revision) | 1525 return lambda: WriteDEPS(revision) |
1522 | 1526 |
1523 self.Expect([ | 1527 self.Expect([ |
1524 Cmd("git status -s -uno", ""), | 1528 Cmd("git status -s -uno", ""), |
1525 Cmd("git status -s -b -uno", "## some_branch\n"), | 1529 Cmd("git status -s -b -uno", "## some_branch\n"), |
1526 Cmd("git fetch", ""), | 1530 Cmd("git fetch", ""), |
1527 Cmd("git svn fetch", ""), | 1531 Cmd("git svn fetch", ""), |
1528 Cmd("git branch", " branch1\n* branch2\n"), | 1532 Cmd("git branch", " branch1\n* branch2\n"), |
1529 Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""), | 1533 Cmd("git new-branch %s" % TEST_CONFIG["BRANCHNAME"], ""), |
1530 Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"), | 1534 Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"), |
1531 Cmd("git reset --hard branch-heads/3.3", ""), | 1535 Cmd("git reset --hard branch-heads/3.3", ""), |
1532 Cmd("git log --format=%H", "hash1\nhash_234"), | 1536 Cmd("git log --format=%H", "hash1\nhash_234"), |
1533 Cmd("git diff --name-only hash1 hash1^", ""), | 1537 Cmd("git diff --name-only hash1 hash1^", ""), |
1534 Cmd("git diff --name-only hash_234 hash_234^", VERSION_FILE), | 1538 Cmd("git diff --name-only hash_234 hash_234^", VERSION_FILE), |
1535 Cmd("git checkout -f hash_234 -- %s" % VERSION_FILE, "", | 1539 Cmd("git checkout -f hash_234 -- %s" % VERSION_FILE, "", |
1536 cb=ResetVersion(3, 1, 1)), | 1540 cb=ResetVersion(3, 1, 1)), |
1537 Cmd("git log -1 --format=%B hash_234", | 1541 Cmd("git log -1 --format=%B hash_234", |
1538 "Version 3.3.1.1 (merged 12)\n\nReview URL: fake.com\n"), | 1542 "Version 3.3.1.1 (merged 12)\n\nReview URL: fake.com\n"), |
1539 Cmd("git log -1 --format=%s hash_234", ""), | 1543 Cmd("git log -1 --format=%s hash_234", ""), |
(...skipping 28 matching lines...) Expand all Loading... |
1568 tag_response_text), | 1572 tag_response_text), |
1569 Cmd("git svn find-rev r22626", "hash_22626"), | 1573 Cmd("git svn find-rev r22626", "hash_22626"), |
1570 Cmd("git svn find-rev hash_22626", "22626"), | 1574 Cmd("git svn find-rev hash_22626", "22626"), |
1571 Cmd("git log -1 --format=%ci hash_22626", "01:23"), | 1575 Cmd("git log -1 --format=%ci hash_22626", "01:23"), |
1572 Cmd("git svn find-rev r22624", "hash_22624"), | 1576 Cmd("git svn find-rev r22624", "hash_22624"), |
1573 Cmd("git svn find-rev hash_22624", "22624"), | 1577 Cmd("git svn find-rev hash_22624", "22624"), |
1574 Cmd("git log -1 --format=%ci hash_22624", "02:34"), | 1578 Cmd("git log -1 --format=%ci hash_22624", "02:34"), |
1575 Cmd("git status -s -uno", "", cwd=chrome_dir), | 1579 Cmd("git status -s -uno", "", cwd=chrome_dir), |
1576 Cmd("git checkout -f master", "", cwd=chrome_dir), | 1580 Cmd("git checkout -f master", "", cwd=chrome_dir), |
1577 Cmd("git pull", "", cwd=chrome_dir), | 1581 Cmd("git pull", "", cwd=chrome_dir), |
1578 Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], "", | 1582 Cmd("git new-branch %s" % TEST_CONFIG["BRANCHNAME"], "", |
1579 cwd=chrome_dir), | 1583 cwd=chrome_dir), |
1580 Cmd("git fetch origin", "", cwd=chrome_v8_dir), | 1584 Cmd("git fetch origin", "", cwd=chrome_v8_dir), |
1581 Cmd("git log --format=%H --grep=\"V8\"", "c_hash1\nc_hash2\nc_hash3\n", | 1585 Cmd("git log --format=%H --grep=\"V8\"", "c_hash1\nc_hash2\nc_hash3\n", |
1582 cwd=chrome_dir), | 1586 cwd=chrome_dir), |
1583 Cmd("git diff --name-only c_hash1 c_hash1^", "", cwd=chrome_dir), | 1587 Cmd("git diff --name-only c_hash1 c_hash1^", "", cwd=chrome_dir), |
1584 Cmd("git diff --name-only c_hash2 c_hash2^", "DEPS", cwd=chrome_dir), | 1588 Cmd("git diff --name-only c_hash2 c_hash2^", "DEPS", cwd=chrome_dir), |
1585 Cmd("git checkout -f c_hash2 -- DEPS", "", | 1589 Cmd("git checkout -f c_hash2 -- DEPS", "", |
1586 cb=ResetDEPS("0123456789012345678901234567890123456789"), | 1590 cb=ResetDEPS("0123456789012345678901234567890123456789"), |
1587 cwd=chrome_dir), | 1591 cwd=chrome_dir), |
1588 Cmd("git log -1 --format=%B c_hash2", c_hash2_commit_log, | 1592 Cmd("git log -1 --format=%B c_hash2", c_hash2_commit_log, |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1713 Cmd("git pull", ""), | 1717 Cmd("git pull", ""), |
1714 Cmd("git branch", ""), | 1718 Cmd("git branch", ""), |
1715 Cmd("git checkout -f master", ""), | 1719 Cmd("git checkout -f master", ""), |
1716 Cmd("git log -1 --format=%H", "latest_hash"), | 1720 Cmd("git log -1 --format=%H", "latest_hash"), |
1717 Cmd("git diff --name-only latest_hash latest_hash^", ""), | 1721 Cmd("git diff --name-only latest_hash latest_hash^", ""), |
1718 URL("https://v8-status.appspot.com/lkgr", "12345"), | 1722 URL("https://v8-status.appspot.com/lkgr", "12345"), |
1719 Cmd("git checkout -f master", ""), | 1723 Cmd("git checkout -f master", ""), |
1720 Cmd(("git log --format=%H --grep=" | 1724 Cmd(("git log --format=%H --grep=" |
1721 "\"^git-svn-id: [^@]*@12345 [A-Za-z0-9-]*$\""), | 1725 "\"^git-svn-id: [^@]*@12345 [A-Za-z0-9-]*$\""), |
1722 "lkgr_hash"), | 1726 "lkgr_hash"), |
1723 Cmd("git checkout -b auto-bump-up-version lkgr_hash", ""), | 1727 Cmd("git new-branch auto-bump-up-version --upstream lkgr_hash", ""), |
1724 Cmd("git checkout -f master", ""), | 1728 Cmd("git checkout -f master", ""), |
1725 Cmd("git branch", "auto-bump-up-version\n* master"), | 1729 Cmd("git branch", "auto-bump-up-version\n* master"), |
1726 Cmd("git branch -D auto-bump-up-version", ""), | 1730 Cmd("git branch -D auto-bump-up-version", ""), |
1727 Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""), | 1731 Cmd("git diff --name-only lkgr_hash lkgr_hash^", ""), |
1728 Cmd("git checkout -f candidates", "", cb=ResetVersion(11, 5)), | 1732 Cmd("git checkout -f candidates", "", cb=ResetVersion(11, 5)), |
1729 Cmd("git pull", ""), | 1733 Cmd("git pull", ""), |
1730 URL("https://v8-status.appspot.com/current?format=json", | 1734 URL("https://v8-status.appspot.com/current?format=json", |
1731 "{\"message\": \"Tree is open\"}"), | 1735 "{\"message\": \"Tree is open\"}"), |
1732 Cmd("git checkout -b auto-bump-up-version master", "", | 1736 Cmd("git new-branch auto-bump-up-version --upstream master", "", |
1733 cb=ResetVersion(11, 4)), | 1737 cb=ResetVersion(11, 4)), |
1734 Cmd("git commit -am \"[Auto-roll] Bump up version to 3.11.6.0\n\n" | 1738 Cmd("git commit -am \"[Auto-roll] Bump up version to 3.11.6.0\n\n" |
1735 "TBR=author@chromium.org\" " | 1739 "TBR=author@chromium.org\" " |
1736 "--author \"author@chromium.org <author@chromium.org>\"", ""), | 1740 "--author \"author@chromium.org <author@chromium.org>\"", ""), |
1737 ] | 1741 ] |
1738 | 1742 |
1739 def testBumpUpVersionGit(self): | 1743 def testBumpUpVersionGit(self): |
1740 expectations = self._bumpUpVersion() | 1744 expectations = self._bumpUpVersion() |
1741 expectations += [ | 1745 expectations += [ |
1742 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f " | 1746 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f " |
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1828 | 1832 |
1829 Review URL: https://codereview.chromium.org/83173002 | 1833 Review URL: https://codereview.chromium.org/83173002 |
1830 | 1834 |
1831 ------------------------------------------------------------------------""") | 1835 ------------------------------------------------------------------------""") |
1832 self.assertEquals( | 1836 self.assertEquals( |
1833 """Prepare push to trunk. Now working on version 3.23.11. | 1837 """Prepare push to trunk. Now working on version 3.23.11. |
1834 | 1838 |
1835 R=danno@chromium.org | 1839 R=danno@chromium.org |
1836 | 1840 |
1837 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1841 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |