summaryrefslogtreecommitdiffstats
path: root/tools/safely-roll-deps.py
diff options
context:
space:
mode:
authorborenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 14:11:41 +0000
committerborenet@google.com <borenet@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-23 14:11:41 +0000
commit3b54b0731b92d52c73620de84e55ddaa3109ff48 (patch)
treefffd9491c0dd305aec7495ef6b4f906d5bb63bc4 /tools/safely-roll-deps.py
parent492456b97239f950cdef1c81da612515188f731e (diff)
downloadchromium_src-3b54b0731b92d52c73620de84e55ddaa3109ff48.zip
chromium_src-3b54b0731b92d52c73620de84e55ddaa3109ff48.tar.gz
chromium_src-3b54b0731b92d52c73620de84e55ddaa3109ff48.tar.bz2
Revert of Remove tools/safely-roll-blink now that tools/safely-roll-deps is stable. (https://codereview.chromium.org/291333007/)
Reason for revert: This removed the wrong file (safely-roll-deps instead of safely-roll-blink). Now Skia's AutoRoll Bot is broken. Original issue's description: > Remove tools/safely-roll-blink now that tools/safely-roll-deps is stable. > > "tools/safely-roll-deps /src blink" > is the replacemnt syntax. No need to keep dead code around. > > BUG=242461 > > Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=272347 TBR=maruel@google.com,borenet@chromium.org,eseidel@chromium.org,blink-deps-roller@chromium.org NOTREECHECKS=true NOTRY=true BUG=242461 Review URL: https://codereview.chromium.org/294163012 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272518 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/safely-roll-deps.py')
-rwxr-xr-xtools/safely-roll-deps.py161
1 files changed, 161 insertions, 0 deletions
diff --git a/tools/safely-roll-deps.py b/tools/safely-roll-deps.py
new file mode 100755
index 0000000..0e75715
--- /dev/null
+++ b/tools/safely-roll-deps.py
@@ -0,0 +1,161 @@
+#!/usr/bin/env python
+# Copyright 2014 The Chromium Authors. All rights reserved.
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
+
+"""Generate a CL to roll a DEPS entry to the specified revision number and post
+it to Rietveld so that the CL will land automatically if it passes the
+commit-queue's checks.
+"""
+
+import logging
+import optparse
+import os
+import re
+import sys
+
+import find_depot_tools
+import scm
+import subprocess2
+
+
+def die_with_error(msg):
+ print >> sys.stderr, msg
+ sys.exit(1)
+
+
+def process_deps(path, project, new_rev, is_dry_run):
+ """Update project_revision to |new_issue|.
+
+ A bit hacky, could it be made better?
+ """
+ content = open(path).read()
+ # Hack for Blink to get the AutoRollBot running again.
+ if project == "blink":
+ project = "webkit"
+ old_line = r'(\s+)"%s_revision": "([0-9a-f]{2,40})",' % project
+ new_line = r'\1"%s_revision": "%s",' % (project, new_rev)
+ new_content = re.sub(old_line, new_line, content, 1)
+ old_rev = re.search(old_line, content).group(2)
+ if not old_rev or new_content == content:
+ die_with_error('Failed to update the DEPS file')
+
+ if not is_dry_run:
+ open(path, 'w').write(new_content)
+ return old_rev
+
+
+class PrintSubprocess(object):
+ """Wrapper for subprocess2 which prints out every command."""
+ def __getattr__(self, attr):
+ def _run_subprocess2(cmd, *args, **kwargs):
+ print cmd
+ sys.stdout.flush()
+ return getattr(subprocess2, attr)(cmd, *args, **kwargs)
+ return _run_subprocess2
+
+prnt_subprocess = PrintSubprocess()
+
+
+def main():
+ tool_dir = os.path.dirname(os.path.abspath(__file__))
+ parser = optparse.OptionParser(usage='%prog [options] <project> <new rev>',
+ description=sys.modules[__name__].__doc__)
+ parser.add_option('-v', '--verbose', action='count', default=0)
+ parser.add_option('--dry-run', action='store_true')
+ parser.add_option('-f', '--force', action='store_true',
+ help='Make destructive changes to the local checkout if '
+ 'necessary.')
+ parser.add_option('--commit', action='store_true', default=True,
+ help='(default) Put change in commit queue on upload.')
+ parser.add_option('--no-commit', action='store_false', dest='commit',
+ help='Don\'t put change in commit queue on upload.')
+ parser.add_option('-r', '--reviewers', default='',
+ help='Add given users as either reviewers or TBR as'
+ ' appropriate.')
+ parser.add_option('--upstream', default='origin/master',
+ help='(default "%default") Use given start point for change'
+ ' to upload. For instance, if you use the old git workflow,'
+ ' you might set it to "origin/trunk".')
+ parser.add_option('--cc', help='CC email addresses for issue.')
+ parser.add_option('-m', '--message', help='Custom commit message.')
+
+ options, args = parser.parse_args()
+ logging.basicConfig(
+ level=
+ [logging.WARNING, logging.INFO, logging.DEBUG][
+ min(2, options.verbose)])
+ if len(args) != 2:
+ parser.print_help()
+ exit(0)
+
+ root_dir = os.path.dirname(tool_dir)
+ os.chdir(root_dir)
+
+ project = args[0]
+ new_rev = args[1]
+
+ # Silence the editor.
+ os.environ['EDITOR'] = 'true'
+
+ if options.force and not options.dry_run:
+ prnt_subprocess.check_call(['git', 'clean', '-d', '-f'])
+ prnt_subprocess.call(['git', 'rebase', '--abort'])
+
+ old_branch = scm.GIT.GetBranch(root_dir)
+ new_branch = '%s_roll' % project
+
+ if options.upstream == new_branch:
+ parser.error('Cannot set %s as its own upstream.' % new_branch)
+
+ if old_branch == new_branch:
+ if options.force:
+ if not options.dry_run:
+ prnt_subprocess.check_call(['git', 'checkout', options.upstream, '-f'])
+ prnt_subprocess.call(['git', 'branch', '-D', old_branch])
+ else:
+ parser.error('Please delete the branch %s and move to a different branch'
+ % new_branch)
+
+ if not options.dry_run:
+ prnt_subprocess.check_call(['git', 'fetch', 'origin'])
+ prnt_subprocess.call(['git', 'svn', 'fetch'])
+ branch_cmd = ['git', 'checkout', '-b', new_branch, options.upstream]
+ if options.force:
+ branch_cmd.append('-f')
+ prnt_subprocess.check_output(branch_cmd)
+
+ try:
+ old_rev = process_deps(os.path.join(root_dir, 'DEPS'), project, new_rev,
+ options.dry_run)
+ print '%s roll %s:%s' % (project.title(), old_rev, new_rev)
+
+ review_field = 'TBR' if options.commit else 'R'
+ commit_msg = options.message or '%s roll %s:%s\n' % (project.title(),
+ old_rev, new_rev)
+ commit_msg += '\n%s=%s\n' % (review_field, options.reviewers)
+
+ if options.dry_run:
+ print 'Commit message: ' + commit_msg
+ return 0
+
+ prnt_subprocess.check_output(['git', 'commit', '-m', commit_msg, 'DEPS'])
+ prnt_subprocess.check_call(['git', 'diff', '--no-ext-diff',
+ options.upstream])
+ upload_cmd = ['git', 'cl', 'upload']
+ if options.commit:
+ upload_cmd.append('--use-commit-queue')
+ if options.reviewers:
+ upload_cmd.append('--send-mail')
+ if options.cc:
+ upload_cmd.extend(['--cc', options.cc])
+ prnt_subprocess.check_call(upload_cmd)
+ finally:
+ if not options.dry_run:
+ prnt_subprocess.check_output(['git', 'checkout', old_branch])
+ prnt_subprocess.check_output(['git', 'branch', '-D', new_branch])
+ return 0
+
+
+if __name__ == '__main__':
+ sys.exit(main())