sync-webkit-git: more windows fixes

tools/sync-webkit-git.py

 #!/usr/bin/python
 # Copyright (c) 2009 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.
 
@@ skipping 33 matching lines @@
   # 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+) ')
 
-  # On Windows, use shell=True to get PATH interpretation.
-  shell = (os.name == 'nt')
   log = subprocess.Popen(['git', 'log', '--no-color', '--first-parent',
-                          '--pretty=medium', 'origin'], shell=shell,
+                          '--pretty=medium', 'origin'],
+                         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)
     if match:
@@ skipping 13 matching lines @@
   print "Something has likely gone horribly wrong."
   return None
 
 def UpdateGClientBranch(webkit_rev):
   """Update the magic gclient branch to point at |webkit_rev|.
 
   Returns: true if the branch didn't need changes."""
   target = FindSVNRev(webkit_rev)
   if not target:
     print "r%s not available; fetching." % webkit_rev
-    subprocess.check_call(['git', 'fetch'])
+    subprocess.check_call(['git', 'fetch'], shell=(os.name == 'nt'))
     target = FindSVNRev(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])
+                         MAGIC_GCLIENT_BRANCH, target],
+                         shell=(os.name == 'nt'))
   return True
 
 def UpdateCurrentCheckoutIfAppropriate():
   """Reset the current gclient branch if that's what we have checked out."""
   branch = RunGit(['symbolic-ref', '-q', 'HEAD'])
   if branch != MAGIC_GCLIENT_BRANCH:
     print "We have now updated the 'gclient' branch, but third_party/WebKit"
     print "has some other branch ('%s') checked out." % branch
     print "Run 'git checkout gclient' under third_party/WebKit if you want"
     print "to switch it to the version requested by DEPS."
     return 1
 
   if subprocess.call(['git', 'diff-index', '--exit-code', '--shortstat',
-                      'HEAD']):
+                      'HEAD'], shell=(os.name == 'nt')):
     print "Resetting tree state to new revision."
-    subprocess.check_call(['git', 'reset', '--hard'])
+    subprocess.check_call(['git', 'reset', '--hard'], shell=(os.name == 'nt'))
 
 def main():
   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()
   print 'Desired revision: r%s.' % webkit_rev
   os.chdir('third_party/WebKit')
   changed = UpdateGClientBranch(webkit_rev)
   if changed:
     return UpdateCurrentCheckoutIfAppropriate()
   else:
     print "Already on correct revision."
   return 0
 
 if __name__ == '__main__':
   sys.exit(main())