Enhance sync-webkit-git.py to support more actions.

tools/sync-webkit-git.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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.
 
 """Update third_party/WebKit using git.
 
 Under the assumption third_party/WebKit is a clone of git.webkit.org,
 we can use git commands to make it match the version requested by DEPS.
 
 See http://code.google.com/p/chromium/wiki/UsingWebKitGit for details on
 how to use this.
 """
 
 import logging
 import optparse
 import os
 import re
 import subprocess
 import sys
+import urllib
 
 
 def RunGit(command):
   """Run a git subcommand, returning its output."""
   # On Windows, use shell=True to get PATH interpretation.
   command = ['git'] + command
   logging.info(' '.join(command))
   shell = (os.name == 'nt')
   proc = subprocess.Popen(command, shell=shell, stdout=subprocess.PIPE)
   out = proc.communicate()[0].strip()
@@ skipping 29 matching lines @@
 
 
 def GetWebKitRev():
   """Extract the 'webkit_revision' variable out of DEPS."""
   locals = {'Var': lambda _: locals["vars"][_],
             'From': lambda *args: None}
   execfile('DEPS', {}, locals)
   return locals['vars']['webkit_revision']
 
 
-def FindSVNRev(target_rev):
+def GetWebKitRevFromTarball(version):
+  """Extract the 'webkit_revision' variable out of tarball DEPS."""
+  deps_url = "http://src.chromium.org/svn/releases/" + version + "/DEPS"
+  f = urllib.urlopen(deps_url)
+  s = f.read()
+  m = re.search('(?<=Source@)\w+', s)

[tony, 2011/12/01 17:38:42]

Nit: Can we make this match WebKit/Source?  That might be a bit more future
proof.

+  return m.group(0)
+
+
+def FindSVNRev(branch_name, target_rev):
   """Map an SVN revision to a git hash.
   Like 'git svn find-rev' but without the git-svn bits."""
 
   # We iterate through the commit log looking for "git-svn-id" lines,
   # which contain the SVN revision of that commit.  We can stop once
   # we've found our target (or hit a revision number lower than what
   # we're looking for, indicating not found).
 
   target_rev = int(target_rev)
 
   # regexp matching the "commit" line from the log.
   commit_re = re.compile(r'^commit ([a-f\d]{40})$')
   # regexp matching the git-svn line from the log.
   git_svn_re = re.compile(r'^\s+git-svn-id: [^@]+@(\d+) ')
+  if not branch_name:
+    branch_name = 'origin/master'
   cmd = ['git', 'log', '--no-color', '--first-parent', '--pretty=medium',
-         'origin/master']
+         branch_name]
   logging.info(' '.join(cmd))
   log = subprocess.Popen(cmd, shell=(os.name == 'nt'), stdout=subprocess.PIPE)
   # Track whether we saw a revision *later* than the one we're seeking.
   saw_later = False
   for line in log.stdout:
     match = commit_re.match(line)
     if match:
       commit = match.group(1)
       continue
     match = git_svn_re.match(line)
@@ skipping 19 matching lines @@
   branch = GetOverrideShortBranchName()
   if not branch:
     branch = 'gclient'
 
   remote = RunGit(['config', '--get', 'branch.' + branch + '.remote'])
   if remote:
     return remote
   return 'origin'
 
 
-def UpdateGClientBranch(webkit_rev, magic_gclient_branch):
+def UpdateGClientBranch(branch_name, webkit_rev, magic_gclient_branch):
   """Update the magic gclient branch to point at |webkit_rev|.
 
   Returns: true if the branch didn't need changes."""
-  target = FindSVNRev(webkit_rev)
+  target = FindSVNRev(branch_name, webkit_rev)
   if not target:
     print "r%s not available; fetching." % webkit_rev
     subprocess.check_call(['git', 'fetch', GetRemote()],
                           shell=(os.name == 'nt'))
-    target = FindSVNRev(webkit_rev)
+    target = FindSVNRev(branch_name, webkit_rev)
   if not target:
     print "ERROR: Couldn't map r%s to a git revision." % webkit_rev
     sys.exit(1)
 
   current = RunGit(['show-ref', '--hash', magic_gclient_branch])
   if current == target:
     return False  # No change necessary.
 
   subprocess.check_call(['git', 'update-ref', '-m', 'gclient sync',
                          magic_gclient_branch, target],
@@ skipping 13 matching lines @@
 
   if subprocess.call(['git', 'diff-index', '--exit-code', '--shortstat',
                       'HEAD'], shell=(os.name == 'nt')):
     print "Resetting tree state to new revision."
     subprocess.check_call(['git', 'reset', '--hard'], shell=(os.name == 'nt'))
 
 
 def main():
   parser = optparse.OptionParser()
   parser.add_option('-v', '--verbose', action='store_true')
+  parser.add_option('-r', '--revision', help="switch to desired revision")
+  parser.add_option('-t', '--tarball', help="switch to desired tarball release")
+  parser.add_option('-b', '--branch', help="branch name that gclient generate")
   options, args = parser.parse_args()
   if options.verbose:
     logging.basicConfig(level=logging.INFO)
   if not os.path.exists('third_party/WebKit/.git'):
     if os.path.exists('third_party/WebKit'):
       print "ERROR: third_party/WebKit appears to not be under git control."
     else:
       print "ERROR: third_party/WebKit could not be found."
       print "Did you run this script from the right directory?"
 
     print "See http://code.google.com/p/chromium/wiki/UsingWebKitGit for"
     print "setup instructions."
     return 1
 
-  webkit_rev = GetWebKitRev()
+  if options.revision:
+    webkit_rev = options.revision
+    if options.tarball:
+      print "WARNING: --revision is given, so ignore --tarball"
+  else:
+    if options.tarball:
+      webkit_rev = GetWebKitRevFromTarball(options.tarball)
+    else:
+      webkit_rev = GetWebKitRev()
+
   print 'Desired revision: r%s.' % webkit_rev
   os.chdir('third_party/WebKit')
   magic_gclient_branch = GetGClientBranchName()
-  changed = UpdateGClientBranch(webkit_rev, magic_gclient_branch)
+  changed = UpdateGClientBranch(options.branch, webkit_rev,
+                                magic_gclient_branch)
   if changed:
     return UpdateCurrentCheckoutIfAppropriate(magic_gclient_branch)
   else:
     print "Already on correct revision."
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main())