| OLD | NEW |
| (Empty) |
| 1 #!/usr/bin/env python | |
| 2 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | |
| 3 # Use of this source code is governed by a BSD-style license that can be | |
| 4 # found in the LICENSE file. | |
| 5 | |
| 6 """Generate a CL to roll webkit to the specified revision number and post | |
| 7 it to Rietveld so that the CL will land automatically if it passes the | |
| 8 commit-queue's checks. | |
| 9 """ | |
| 10 | |
| 11 import logging | |
| 12 import optparse | |
| 13 import os | |
| 14 import re | |
| 15 import sys | |
| 16 | |
| 17 import find_depot_tools | |
| 18 import scm | |
| 19 import subprocess2 | |
| 20 | |
| 21 | |
| 22 def die_with_error(msg): | |
| 23 print >> sys.stderr, msg | |
| 24 sys.exit(1) | |
| 25 | |
| 26 | |
| 27 def process_deps(path, new_rev): | |
| 28 """Update webkit_revision to |new_issue|. | |
| 29 | |
| 30 A bit hacky, could it be made better? | |
| 31 """ | |
| 32 content = open(path).read() | |
| 33 old_line = r'(\s+)"webkit_revision": "(\d+)",' | |
| 34 new_line = r'\1"webkit_revision": "%d",' % new_rev | |
| 35 new_content = re.sub(old_line, new_line, content, 1) | |
| 36 old_rev = re.search(old_line, content).group(2) | |
| 37 if not old_rev or new_content == content: | |
| 38 die_with_error('Failed to update the DEPS file') | |
| 39 | |
| 40 open(path, 'w').write(new_content) | |
| 41 return old_rev | |
| 42 | |
| 43 | |
| 44 def main(): | |
| 45 tool_dir = os.path.dirname(os.path.abspath(__file__)) | |
| 46 parser = optparse.OptionParser(usage='%prog [options] <new webkit rev>') | |
| 47 parser.add_option('-v', '--verbose', action='count', default=0) | |
| 48 parser.add_option('--commit', action='store_true', default=True, | |
| 49 help='(default) Put change in commit queue on upload.') | |
| 50 parser.add_option('--no-commit', action='store_false', dest='commit', | |
| 51 help='Don\'t put change in commit queue on upload.') | |
| 52 parser.add_option('-r', '--reviewers', default='', | |
| 53 help='Add given users as either reviewers or TBR as' | |
| 54 ' appropriate.') | |
| 55 parser.add_option('--upstream', default='origin/master', | |
| 56 help='(default "%default") Use given start point for change' | |
| 57 ' to upload. For instance, if you use the old git workflow,' | |
| 58 ' you might set it to "origin/trunk".') | |
| 59 parser.add_option('--cc', help='CC email addresses for issue.') | |
| 60 | |
| 61 options, args = parser.parse_args() | |
| 62 logging.basicConfig( | |
| 63 level= | |
| 64 [logging.WARNING, logging.INFO, logging.DEBUG][ | |
| 65 min(2, options.verbose)]) | |
| 66 if len(args) != 1: | |
| 67 parser.print_help() | |
| 68 exit(0) | |
| 69 | |
| 70 root_dir = os.path.dirname(tool_dir) | |
| 71 os.chdir(root_dir) | |
| 72 | |
| 73 new_rev = int(args[0]) | |
| 74 print 'Roll webkit revision to %s' % new_rev | |
| 75 | |
| 76 # Silence the editor. | |
| 77 os.environ['EDITOR'] = 'true' | |
| 78 | |
| 79 old_branch = scm.GIT.GetBranch(root_dir) | |
| 80 if old_branch == 'webkit_roll': | |
| 81 parser.error( | |
| 82 'Please delete the branch webkit_roll and move to a different branch') | |
| 83 subprocess2.check_output( | |
| 84 ['git', 'checkout', '-b', 'webkit_roll', options.upstream]) | |
| 85 try: | |
| 86 old_rev = int(process_deps(os.path.join(root_dir, 'DEPS'), new_rev)) | |
| 87 review_field = 'TBR' if options.commit else 'R' | |
| 88 commit_msg = ('Webkit roll %s:%s\n' | |
| 89 '\n' | |
| 90 'http://trac.webkit.org/log/?' | |
| 91 'rev=%s&stop_rev=%s&verbose=on\n' | |
| 92 '\n' | |
| 93 '%s=%s\n' % (old_rev, new_rev, | |
| 94 new_rev, old_rev+1, | |
| 95 review_field, | |
| 96 options.reviewers)) | |
| 97 subprocess2.check_output(['git', 'commit', '-m', commit_msg, 'DEPS']) | |
| 98 subprocess2.check_call(['git', 'diff', options.upstream]) | |
| 99 upload_cmd = ['git', 'cl', 'upload'] | |
| 100 if options.commit: | |
| 101 upload_cmd.append('--use-commit-queue') | |
| 102 if options.reviewers: | |
| 103 upload_cmd.append('--send-mail') | |
| 104 if options.cc: | |
| 105 upload_cmd.extend(['--cc', options.cc]) | |
| 106 subprocess2.check_call(upload_cmd) | |
| 107 finally: | |
| 108 subprocess2.check_output(['git', 'checkout', old_branch]) | |
| 109 subprocess2.check_output(['git', 'branch', '-D', 'webkit_roll']) | |
| 110 return 0 | |
| 111 | |
| 112 | |
| 113 if __name__ == '__main__': | |
| 114 sys.exit(main()) | |
| OLD | NEW |