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 883 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
894 | 894 |
895 1999-04-05: Version 3.22.4 | 895 1999-04-05: Version 3.22.4 |
896 | 896 |
897 Performance and stability improvements on all platforms.\n""", | 897 Performance and stability improvements on all platforms.\n""", |
898 change_log) | 898 change_log) |
899 | 899 |
900 expectations = [ | 900 expectations = [ |
901 Cmd("git status -s -uno", ""), | 901 Cmd("git status -s -uno", ""), |
902 Cmd("git status -s -b -uno", "## some_branch\n"), | 902 Cmd("git status -s -b -uno", "## some_branch\n"), |
903 Cmd("git fetch", ""), | 903 Cmd("git fetch", ""), |
| 904 Cmd("git svn fetch", ""), |
904 Cmd("git branch", " branch1\n* branch2\n"), | 905 Cmd("git branch", " branch1\n* branch2\n"), |
905 Cmd("git branch", " branch1\n* branch2\n"), | 906 Cmd("git branch", " branch1\n* branch2\n"), |
906 Cmd("git checkout -b %s origin/master" % TEST_CONFIG["BRANCHNAME"], | 907 Cmd("git checkout -b %s origin/master" % TEST_CONFIG["BRANCHNAME"], |
907 ""), | 908 ""), |
908 Cmd("git svn find-rev r123455", "push_hash\n"), | 909 Cmd("git svn find-rev r123455", "push_hash\n"), |
909 Cmd(("git log -1 --format=%H --grep=" | 910 Cmd(("git log -1 --format=%H --grep=" |
910 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " | 911 "\"^Version [[:digit:]]*\.[[:digit:]]*\.[[:digit:]]* (based\" " |
911 "origin/candidates"), "hash2\n"), | 912 "origin/candidates"), "hash2\n"), |
912 Cmd("git log -1 hash2", "Log message\n"), | 913 Cmd("git log -1 hash2", "Log message\n"), |
913 Cmd("git log -1 --format=%s hash2", | 914 Cmd("git log -1 --format=%s hash2", |
914 "Version 3.4.5 (based on bleeding_edge revision r1234)\n"), | 915 "Version 3.4.5 (based on bleeding_edge revision r1234)\n"), |
915 Cmd("git svn find-rev r1234", "hash3\n"), | 916 Cmd("git svn find-rev r1234", "hash3\n"), |
916 Cmd("git checkout -f origin/master -- src/version.cc", | 917 Cmd("git checkout -f origin/master -- src/version.cc", |
917 "", cb=self.WriteFakeVersionFile), | 918 "", cb=self.WriteFakeVersionFile), |
918 Cmd("git checkout -f hash2 -- src/version.cc", "", | 919 Cmd("git checkout -f hash2 -- src/version.cc", "", |
919 cb=self.WriteFakeVersionFile), | 920 cb=self.WriteFakeVersionFile), |
920 Cmd("git log --format=%H hash3..push_hash", "rev1\n"), | 921 Cmd("git log --format=%H hash3..push_hash", "rev1\n"), |
921 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), | 922 Cmd("git log -1 --format=%s rev1", "Log text 1.\n"), |
922 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), | 923 Cmd("git log -1 --format=%B rev1", "Text\nLOG=YES\nBUG=v8:321\nText\n"), |
923 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), | 924 Cmd("git log -1 --format=%an rev1", "author1@chromium.org\n"), |
924 Cmd("git fetch", "fetch result\n"), | 925 Cmd("git fetch", "fetch result\n"), |
| 926 Cmd("git svn fetch", ""), |
925 Cmd("git checkout -f origin/master", ""), | 927 Cmd("git checkout -f origin/master", ""), |
926 Cmd("git diff origin/candidates push_hash", "patch content\n"), | 928 Cmd("git diff origin/candidates push_hash", "patch content\n"), |
927 Cmd("git svn find-rev push_hash", "123455\n"), | 929 Cmd("git svn find-rev push_hash", "123455\n"), |
928 Cmd("git checkout -b %s origin/candidates" % TEST_CONFIG["TRUNKBRANCH"], | 930 Cmd("git checkout -b %s origin/candidates" % TEST_CONFIG["TRUNKBRANCH"], |
929 "", cb=ResetToTrunk), | 931 "", cb=ResetToTrunk), |
930 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), | 932 Cmd("git apply --index --reject \"%s\"" % TEST_CONFIG["PATCH_FILE"], ""), |
931 Cmd("git checkout -f origin/candidates -- %s" % | 933 Cmd("git checkout -f origin/candidates -- %s" % |
932 TEST_CONFIG["CHANGELOG_FILE"], "", cb=ResetChangeLog), | 934 TEST_CONFIG["CHANGELOG_FILE"], "", cb=ResetChangeLog), |
933 Cmd("git checkout -f origin/candidates -- src/version.cc", "", | 935 Cmd("git checkout -f origin/candidates -- src/version.cc", "", |
934 cb=self.WriteFakeVersionFile), | 936 cb=self.WriteFakeVersionFile), |
(...skipping 400 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1335 os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE)) | 1337 os.path.join(TEST_CONFIG["DEFAULT_CWD"], VERSION_FILE)) |
1336 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version)) | 1338 self.assertTrue(re.search(r"#define MINOR_VERSION\s+22", version)) |
1337 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) | 1339 self.assertTrue(re.search(r"#define BUILD_NUMBER\s+5", version)) |
1338 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) | 1340 self.assertTrue(re.search(r"#define PATCH_LEVEL\s+1", version)) |
1339 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) | 1341 self.assertTrue(re.search(r"#define IS_CANDIDATE_VERSION\s+0", version)) |
1340 | 1342 |
1341 self.Expect([ | 1343 self.Expect([ |
1342 Cmd("git status -s -uno", ""), | 1344 Cmd("git status -s -uno", ""), |
1343 Cmd("git status -s -b -uno", "## some_branch\n"), | 1345 Cmd("git status -s -b -uno", "## some_branch\n"), |
1344 Cmd("git fetch", ""), | 1346 Cmd("git fetch", ""), |
| 1347 Cmd("git svn fetch", ""), |
1345 Cmd("git branch", " branch1\n* branch2\n"), | 1348 Cmd("git branch", " branch1\n* branch2\n"), |
1346 Cmd("git checkout -b %s origin/candidates" % | 1349 Cmd("git checkout -b %s origin/candidates" % |
1347 TEST_CONFIG["BRANCHNAME"], ""), | 1350 TEST_CONFIG["BRANCHNAME"], ""), |
1348 Cmd(("git log --format=%H --grep=\"Port r12345\" " | 1351 Cmd(("git log --format=%H --grep=\"Port r12345\" " |
1349 "--reverse origin/master"), | 1352 "--reverse origin/master"), |
1350 "hash1\nhash2"), | 1353 "hash1\nhash2"), |
1351 Cmd("git svn find-rev hash1 origin/master", "45678"), | 1354 Cmd("git svn find-rev hash1 origin/master", "45678"), |
1352 Cmd("git log -1 --format=%s hash1", "Title1"), | 1355 Cmd("git log -1 --format=%s hash1", "Title1"), |
1353 Cmd("git svn find-rev hash2 origin/master", "23456"), | 1356 Cmd("git svn find-rev hash2 origin/master", "23456"), |
1354 Cmd("git log -1 --format=%s hash2", "Title2"), | 1357 Cmd("git log -1 --format=%s hash2", "Title2"), |
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1507 build=build, | 1510 build=build, |
1508 patch=patch) | 1511 patch=patch) |
1509 | 1512 |
1510 def ResetDEPS(revision): | 1513 def ResetDEPS(revision): |
1511 return lambda: WriteDEPS(revision) | 1514 return lambda: WriteDEPS(revision) |
1512 | 1515 |
1513 self.Expect([ | 1516 self.Expect([ |
1514 Cmd("git status -s -uno", ""), | 1517 Cmd("git status -s -uno", ""), |
1515 Cmd("git status -s -b -uno", "## some_branch\n"), | 1518 Cmd("git status -s -b -uno", "## some_branch\n"), |
1516 Cmd("git fetch", ""), | 1519 Cmd("git fetch", ""), |
| 1520 Cmd("git svn fetch", ""), |
1517 Cmd("git branch", " branch1\n* branch2\n"), | 1521 Cmd("git branch", " branch1\n* branch2\n"), |
1518 Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""), | 1522 Cmd("git checkout -b %s" % TEST_CONFIG["BRANCHNAME"], ""), |
1519 Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"), | 1523 Cmd("git branch -r", " branch-heads/3.21\n branch-heads/3.3\n"), |
1520 Cmd("git reset --hard branch-heads/3.3", ""), | 1524 Cmd("git reset --hard branch-heads/3.3", ""), |
1521 Cmd("git log --format=%H", "hash1\nhash_234"), | 1525 Cmd("git log --format=%H", "hash1\nhash_234"), |
1522 Cmd("git diff --name-only hash1 hash1^", ""), | 1526 Cmd("git diff --name-only hash1 hash1^", ""), |
1523 Cmd("git diff --name-only hash_234 hash_234^", VERSION_FILE), | 1527 Cmd("git diff --name-only hash_234 hash_234^", VERSION_FILE), |
1524 Cmd("git checkout -f hash_234 -- %s" % VERSION_FILE, "", | 1528 Cmd("git checkout -f hash_234 -- %s" % VERSION_FILE, "", |
1525 cb=ResetVersion(3, 1, 1)), | 1529 cb=ResetVersion(3, 1, 1)), |
1526 Cmd("git log -1 --format=%B hash_234", | 1530 Cmd("git log -1 --format=%B hash_234", |
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1869 | 1873 |
1870 Review URL: https://codereview.chromium.org/83173002 | 1874 Review URL: https://codereview.chromium.org/83173002 |
1871 | 1875 |
1872 ------------------------------------------------------------------------""") | 1876 ------------------------------------------------------------------------""") |
1873 self.assertEquals( | 1877 self.assertEquals( |
1874 """Prepare push to trunk. Now working on version 3.23.11. | 1878 """Prepare push to trunk. Now working on version 3.23.11. |
1875 | 1879 |
1876 R=danno@chromium.org | 1880 R=danno@chromium.org |
1877 | 1881 |
1878 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1882 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |