OLD | NEW |
1 #!/usr/bin/python2 | 1 #!/usr/bin/python2 |
2 | 2 |
3 # Copyright 2014 Google Inc. | 3 # Copyright 2014 Google Inc. |
4 # | 4 # |
5 # Use of this source code is governed by a BSD-style license that can be | 5 # Use of this source code is governed by a BSD-style license that can be |
6 # found in the LICENSE file. | 6 # found in the LICENSE file. |
7 | 7 |
8 """Skia's Chromium DEPS roll script. | 8 """Skia's Chromium DEPS roll script. |
9 | 9 |
10 This script: | 10 This script: |
(...skipping 726 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
737 codereview.issue, '(?P<return>https?://[^) ]+)', '?') | 737 codereview.issue, '(?P<return>https?://[^) ]+)', '?') |
738 | 738 |
739 if config.save_branches: | 739 if config.save_branches: |
740 branch = 'roll_%d_%s' % (revision, master_hash[:8]) | 740 branch = 'roll_%d_%s' % (revision, master_hash[:8]) |
741 message = ( | 741 message = ( |
742 'roll skia DEPS to %d\n\n' | 742 'roll skia DEPS to %d\n\n' |
743 'Chromium base revision: %d / %s\n' | 743 'Chromium base revision: %d / %s\n' |
744 'Old Skia revision: %s\n' | 744 'Old Skia revision: %s\n' |
745 'New Skia revision: %d\n' | 745 'New Skia revision: %d\n' |
746 'Control CL: %s\n\n' | 746 'Control CL: %s\n\n' |
747 'This CL was created by Skia\'s roll_deps.py script.\n' | 747 'This CL was created by Skia\'s roll_deps.py script.\n\n' |
| 748 'Bypassing commit queue trybots:\n' |
| 749 'NOTRY=true\n' |
748 % (revision, master_revision, master_hash[:8], | 750 % (revision, master_revision, master_hash[:8], |
749 old_revision, revision, control_url)) | 751 old_revision, revision, control_url)) |
750 codereview = GitBranchCLUpload(config, message, branch) | 752 codereview = GitBranchCLUpload(config, message, branch) |
751 with codereview: | 753 with codereview: |
752 change_skia_deps(revision, git_hash, 'DEPS') | 754 change_skia_deps(revision, git_hash, 'DEPS') |
753 codereview.stage_for_commit('DEPS') | 755 codereview.stage_for_commit('DEPS') |
754 deps_cl = codereview.issue | 756 deps_cl = codereview.issue |
755 if branch: | 757 if branch: |
756 deps_cl = '%s\n branch: %s' % (deps_cl, branch) | 758 deps_cl = '%s\n branch: %s' % (deps_cl, branch) |
757 | 759 |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
815 if not test_git_executable(options.git_path): | 817 if not test_git_executable(options.git_path): |
816 option_parser.error('Invalid git executable.') | 818 option_parser.error('Invalid git executable.') |
817 | 819 |
818 config = DepsRollConfig(options) | 820 config = DepsRollConfig(options) |
819 find_hash_and_roll_deps(config, options.revision, options.git_hash) | 821 find_hash_and_roll_deps(config, options.revision, options.git_hash) |
820 | 822 |
821 | 823 |
822 if __name__ == '__main__': | 824 if __name__ == '__main__': |
823 main(sys.argv[1:]) | 825 main(sys.argv[1:]) |
824 | 826 |
OLD | NEW |