| 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 1103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1114 Cmd("git branch", "", cwd=chrome_dir), | 1114 Cmd("git branch", "", cwd=chrome_dir), |
| 1115 Cmd("git pull", "", cwd=chrome_dir), | 1115 Cmd("git pull", "", cwd=chrome_dir), |
| 1116 Cmd("git fetch origin", ""), | 1116 Cmd("git fetch origin", ""), |
| 1117 Cmd("git new-branch work-branch", "", cwd=chrome_dir), | 1117 Cmd("git new-branch work-branch", "", cwd=chrome_dir), |
| 1118 Cmd("roll-dep-svn v8 roll_hsh", "rolled", cb=WriteDeps, cwd=chrome_dir), | 1118 Cmd("roll-dep-svn v8 roll_hsh", "rolled", cb=WriteDeps, cwd=chrome_dir), |
| 1119 Cmd(("git commit -am \"%s\" " | 1119 Cmd(("git commit -am \"%s\" " |
| 1120 "--author \"author@chromium.org <author@chromium.org>\"" % | 1120 "--author \"author@chromium.org <author@chromium.org>\"" % |
| 1121 self.ROLL_COMMIT_MSG), | 1121 self.ROLL_COMMIT_MSG), |
| 1122 "", cwd=chrome_dir), | 1122 "", cwd=chrome_dir), |
| 1123 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f " | 1123 Cmd("git cl upload --send-mail --email \"author@chromium.org\" -f " |
| 1124 "--use-commit-queue", "", cwd=chrome_dir), | 1124 "--use-commit-queue --bypass-hooks", "", cwd=chrome_dir), |
| 1125 Cmd("git checkout -f master", "", cwd=chrome_dir), | 1125 Cmd("git checkout -f master", "", cwd=chrome_dir), |
| 1126 Cmd("git branch -D work-branch", "", cwd=chrome_dir), | 1126 Cmd("git branch -D work-branch", "", cwd=chrome_dir), |
| 1127 ] | 1127 ] |
| 1128 self.Expect(expectations) | 1128 self.Expect(expectations) |
| 1129 | 1129 |
| 1130 args = ["-a", "author@chromium.org", "-c", chrome_dir, | 1130 args = ["-a", "author@chromium.org", "-c", chrome_dir, |
| 1131 "-r", "reviewer@chromium.org", "--json-output", json_output_file] | 1131 "-r", "reviewer@chromium.org", "--json-output", json_output_file] |
| 1132 auto_roll.AutoRoll(TEST_CONFIG, self).Run(args) | 1132 auto_roll.AutoRoll(TEST_CONFIG, self).Run(args) |
| 1133 | 1133 |
| 1134 deps = FileToText(os.path.join(chrome_dir, "DEPS")) | 1134 deps = FileToText(os.path.join(chrome_dir, "DEPS")) |
| (...skipping 436 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1571 | 1571 |
| 1572 Review URL: https://codereview.chromium.org/83173002 | 1572 Review URL: https://codereview.chromium.org/83173002 |
| 1573 | 1573 |
| 1574 ------------------------------------------------------------------------""") | 1574 ------------------------------------------------------------------------""") |
| 1575 self.assertEquals( | 1575 self.assertEquals( |
| 1576 """Prepare push to trunk. Now working on version 3.23.11. | 1576 """Prepare push to trunk. Now working on version 3.23.11. |
| 1577 | 1577 |
| 1578 R=danno@chromium.org | 1578 R=danno@chromium.org |
| 1579 | 1579 |
| 1580 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) | 1580 Committed: https://code.google.com/p/v8/source/detail?r=17997""", body) |
| OLD | NEW |