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 772 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
783 Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG["CHANGELOG_FILE"], "", | 783 Cmd("git checkout -f svn/trunk -- %s" % TEST_CONFIG["CHANGELOG_FILE"], "", |
784 cb=ResetChangeLog), | 784 cb=ResetChangeLog), |
785 Cmd("git checkout -f svn/trunk -- src/version.cc", "", | 785 Cmd("git checkout -f svn/trunk -- src/version.cc", "", |
786 cb=self.WriteFakeVersionFile), | 786 cb=self.WriteFakeVersionFile), |
787 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", | 787 Cmd("git commit -aF \"%s\"" % TEST_CONFIG["COMMITMSG_FILE"], "", |
788 cb=CheckSVNCommit), | 788 cb=CheckSVNCommit), |
789 ] | 789 ] |
790 if manual: | 790 if manual: |
791 expectations.append(RL("Y")) # Sanity check. | 791 expectations.append(RL("Y")) # Sanity check. |
792 expectations += [ | 792 expectations += [ |
793 Cmd("git svn dcommit 2>&1", | 793 Cmd("git svn dcommit 2>&1", ""), |
794 "Some output\nCommitted r123456\nSome output\n"), | |
795 Cmd("git svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""), | 794 Cmd("git svn tag 3.22.5 -m \"Tagging version 3.22.5\"", ""), |
796 Cmd("git checkout -f some_branch", ""), | 795 Cmd("git checkout -f some_branch", ""), |
797 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), | 796 Cmd("git branch -D %s" % TEST_CONFIG["BRANCHNAME"], ""), |
798 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""), | 797 Cmd("git branch -D %s" % TEST_CONFIG["TRUNKBRANCH"], ""), |
799 ] | 798 ] |
800 self.Expect(expectations) | 799 self.Expect(expectations) |
801 | 800 |
802 args = ["-a", "author@chromium.org", "--revision", "123455"] | 801 args = ["-a", "author@chromium.org", "--revision", "123455"] |
803 if force: args.append("-f") | 802 if force: args.append("-f") |
804 if manual: args.append("-m") | 803 if manual: args.append("-m") |
(...skipping 729 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1534 | 1533 |
1535 Review URL: https://codereview.chromium.org/83173002 | 1534 Review URL: https://codereview.chromium.org/83173002 |
1536 | 1535 |
1537 ------------------------------------------------------------------------""") | 1536 ------------------------------------------------------------------------""") |
1538 self.assertEquals( | 1537 self.assertEquals( |
1539 """Prepare push to trunk. Now working on version 3.23.11. | 1538 """Prepare push to trunk. Now working on version 3.23.11. |
1540 | 1539 |
1541 R=danno@chromium.org | 1540 R=danno@chromium.org |
1542 | 1541 |
1543 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1542 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
OLD | NEW |