Ensure that we pick up 'git.bat' and 'svn.bat' on Windows.

fetch.py

 #!/usr/bin/env python
 # Copyright (c) 2013 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.
 
 """
 Tool to perform checkouts in one easy command line!
 
 Usage:
   fetch <recipe> [--property=value [--property2=value2 ...]]
 
 This script is a wrapper around various version control and repository
 checkout commands. It requires a |recipe| name, fetches data from that
 recipe in depot_tools/recipes, and then performs all necessary inits,
 checkouts, pulls, fetches, etc.
 
 Optional arguments may be passed on the command line in key-value pairs.
 These parameters will be passed through to the recipe's main method.
 """
 
 import json
 import os
 import subprocess
 import sys
 import pipes
 
+from distutils import spawn
+
 
 SCRIPT_PATH = os.path.dirname(os.path.abspath(__file__))
 
 
 #################################################
 # Checkout class definitions.
 #################################################
 class Checkout(object):
   """Base class for implementing different types of checkouts.
 
@@ skipping 12 matching lines @@
 
   def exists(self):
     pass
 
   def init(self):
     pass
 
   def sync(self):
     pass
 
+  def run(self, tool, cmd_prefix, *cmd, **kwargs):
+    print 'Running: %s %s' % (tool,

[szager1, 2013/04/12 03:47:07]

Just curious, why print a symbolic name for the command here, rather than
cmd_prefix?  Makes the terminal output less useful, because I can't cut and
paste it to the shell prompt to reproduce.

[Dirk Pranke, 2013/04/12 03:56:43]

Heh. I actually want to be able to cut and paste, so I hate the 'Running: '
part. Partially, I didn't want to print out the path to python and the '.py',
but I think I can fix that by doing a find_executable on gclient as well.

+                              ' '.join(pipes.quote(x) for x in cmd))
+    if self.dryrun:
+      return 0
+    return subprocess.check_call(cmd_prefix + cmd, **kwargs)
+
 
 class GclientCheckout(Checkout):
 
   def run_gclient(self, *cmd, **kwargs):
-    print 'Running: gclient %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(
-          (sys.executable, os.path.join(SCRIPT_PATH, 'gclient.py')) + cmd,
-          **kwargs)
+    return self.run('gclient',
+                    (sys.executable, os.path.join(SCRIPT_PATH, 'gclient.py')),
+                    *cmd, **kwargs)
 
 
 class GitCheckout(Checkout):
 
   def run_git(self, *cmd, **kwargs):
-    print 'Running: git %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(('git',) + cmd, **kwargs)
+    if sys.platform == 'win32' and not spawn.find_executable('git'):

[szager1, 2013/04/12 03:47:07]

Optional, but better organization:

class GitCheckout(Checkout):
  if sys.platform == 'win32' and ...:
    exe = os.path.join(SCRIPT_PATH, ...)
  else
    exe = 'git'

  def run_git(self, *cmd, **kwargs):
    return self.run('git', (self.exe,), *cmd, **kwargs)

[Dirk Pranke, 2013/04/12 03:56:43]

I'm not really a fan of class-level statement control flow, so I'll pass on
this.

+      git_path = os.path.join(SCRIPT_PATH, 'git-1.8.0_bin', 'bin', 'git.exe')
+    else:
+      git_path = 'git'
+    return self.run('git', (git_path,), *cmd, **kwargs)
 
 
 class SvnCheckout(Checkout):
 
   def run_svn(self, *cmd, **kwargs):
-    print 'Running: svn %s' % ' '.join(pipes.quote(x) for x in cmd)
-    if not self.dryrun:
-      return subprocess.check_call(('svn',) + cmd, **kwargs)
+    if sys.platform == 'win32' and not spawn.find_executable('svn'):

[szager1, 2013/04/12 03:47:07]

Same comment.

[Dirk Pranke, 2013/04/12 03:56:43]

same reply :)

+      svn_path = os.path.join(SCRIPT_PATH, 'svn_bin', 'svn.exe')
+    else:
+      svn_path = 'svn'
+    return self.run('svn', (svn_path,), *cmd, **kwargs)
 
 
 class GclientGitCheckout(GclientCheckout, GitCheckout):
 
   def __init__(self, dryrun, spec, root):
     super(GclientGitCheckout, self).__init__(dryrun, spec, root)
     assert 'solutions' in self.spec
     keys = ['solutions', 'target_os', 'target_os_only']
     gclient_spec = '\n'.join('%s = %s' % (key, self.spec[key])
                              for key in self.spec if key in keys)
@@ skipping 160 matching lines @@
 
 
 def main():
   dryrun, recipe, props = handle_args(sys.argv)
   spec, root = run_recipe_fetch(recipe, props)
   return run(dryrun, spec, root)
 
 
 if __name__ == '__main__':
   sys.exit(main())