| 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 347 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 358 | 358 |
| 359 vsp.check_call([git, 'commit', '-q', '-m', message]) | 359 vsp.check_call([git, 'commit', '-q', '-m', message]) |
| 360 | 360 |
| 361 git_cl = [git, 'cl', 'upload', '-f', | 361 git_cl = [git, 'cl', 'upload', '-f', |
| 362 '--bypass-hooks', '--bypass-watchlists'] | 362 '--bypass-hooks', '--bypass-watchlists'] |
| 363 if config.cc_list: | 363 if config.cc_list: |
| 364 git_cl.append('--cc=%s' % config.cc_list) | 364 git_cl.append('--cc=%s' % config.cc_list) |
| 365 if config.reviewers_list: | 365 if config.reviewers_list: |
| 366 git_cl.append('--reviewers=%s' % config.reviewers_list) | 366 git_cl.append('--reviewers=%s' % config.reviewers_list) |
| 367 | 367 |
| 368 git_try = [git, 'cl', 'try', '--revision', svn_info] | 368 git_try = [ |
| 369 git, 'cl', 'try', '-m', 'tryserver.chromium', '--revision', svn_info] |
| 369 git_try.extend([arg for bot in config.cl_bot_list for arg in ('-b', bot)]) | 370 git_try.extend([arg for bot in config.cl_bot_list for arg in ('-b', bot)]) |
| 370 | 371 |
| 371 branch_name = git_utils.git_branch_name(vsp.verbose) | 372 branch_name = git_utils.git_branch_name(vsp.verbose) |
| 372 | 373 |
| 373 if config.skip_cl_upload: | 374 if config.skip_cl_upload: |
| 374 space = ' ' | 375 space = ' ' |
| 375 print 'You should call:' | 376 print 'You should call:' |
| 376 print '%scd %s' % (space, os.getcwd()) | 377 print '%scd %s' % (space, os.getcwd()) |
| 377 misc_utils.print_subprocess_args(space, [git, 'checkout', branch_name]) | 378 misc_utils.print_subprocess_args(space, [git, 'checkout', branch_name]) |
| 378 misc_utils.print_subprocess_args(space, git_cl) | 379 misc_utils.print_subprocess_args(space, git_cl) |
| (...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 532 if not git_utils.git_executable(): | 533 if not git_utils.git_executable(): |
| 533 option_parser.error('Invalid git executable.') | 534 option_parser.error('Invalid git executable.') |
| 534 | 535 |
| 535 config = DepsRollConfig(options) | 536 config = DepsRollConfig(options) |
| 536 find_hash_and_roll_deps(config, options.revision, options.git_hash) | 537 find_hash_and_roll_deps(config, options.revision, options.git_hash) |
| 537 | 538 |
| 538 | 539 |
| 539 if __name__ == '__main__': | 540 if __name__ == '__main__': |
| 540 main(sys.argv[1:]) | 541 main(sys.argv[1:]) |
| 541 | 542 |
| OLD | NEW |