Show old revision number in WebKit rolls.
BUG=131920
TEST=
Review URL: https://chromiumcodereview.appspot.com/10532110
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@141798 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/tools/safely-roll-webkit.py b/tools/safely-roll-webkit.py
index 2ddb086..f810ce0 100755
--- a/tools/safely-roll-webkit.py
+++ b/tools/safely-roll-webkit.py
@@ -33,9 +33,12 @@
old_line = r'(\s+)"webkit_revision": "(\d+)",'
new_line = r'\1"webkit_revision": "%d",' % new_rev
new_content = re.sub(old_line, new_line, content, 1)
- if new_content == content:
+ 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')
+
open(path, 'w').write(new_content)
+ return old_rev
def main():
@@ -54,8 +57,7 @@
os.chdir(root_dir)
new_rev = int(args[0])
- msg = 'Roll webkit revision to %s' % new_rev
- print msg
+ print 'Roll webkit revision to %s' % new_rev
# Silence the editor.
os.environ['EDITOR'] = 'true'
@@ -67,8 +69,8 @@
subprocess2.check_output(
['git', 'checkout', '-b', 'webkit_roll', 'origin/master'])
try:
- process_deps(os.path.join(root_dir, 'DEPS'), new_rev)
- commit_msg = msg + '\n\nTBR=\n'
+ old_rev = process_deps(os.path.join(root_dir, 'DEPS'), new_rev)
+ commit_msg = 'Webkit roll %s:%s\n\nTBR=\n' % (old_rev, new_rev)
subprocess2.check_output(['git', 'commit', '-m', commit_msg, 'DEPS'])
subprocess2.check_call(['git', 'diff', 'origin/master'])
subprocess2.check_call(['git', 'cl', 'upload', '--use-commit-queue'])
