Depot tools: use the clang-format binaries that are now included

git_cl.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 # Copyright (C) 2008 Evan Martin <martine@danga.com>
 
 """A git-command for integrating reviews on Rietveld."""
 
 from distutils.version import LooseVersion
@@ skipping 14 matching lines @@
 
 try:
   import readline  # pylint: disable=F0401,W0611
 except ImportError:
   pass
 
 
 from third_party import colorama
 from third_party import upload
 import breakpad  # pylint: disable=W0611
+import clang_format
 import fix_encoding
 import gclient_utils
 import presubmit_support
 import rietveld
 import scm
 import subcommand
 import subprocess2
 import watchlists
 import owners_finder
 
@@ skipping 217 matching lines @@
     self.viewvc_url = None
     self.updated = False
     self.is_gerrit = None
     self.git_editor = None
 
   def LazyUpdateIfNeeded(self):
     """Updates the settings from a codereview.settings file, if available."""
     if not self.updated:
       # The only value that actually changes the behavior is
       # autoupdate = "false". Everything else means "true".
-      autoupdate = RunGit(['config', 'rietveld.autoupdate'], 
+      autoupdate = RunGit(['config', 'rietveld.autoupdate'],
                           error_ok=True
                           ).strip().lower()
 
       cr_settings_file = FindCodereviewSettingsFile()
       if autoupdate != 'false' and cr_settings_file:
         LoadCodereviewSettingsFromFile(cr_settings_file)
         # set updated to True to avoid infinite calling loop
         # through DownloadHooks
         self.updated = True
         DownloadHooks(False)
@@ skipping 2052 matching lines @@
     DieWithError('Could not find base commit for this branch. '
                  'Are you in detached state?')
 
   diff_cmd.append(upstream_commit)
 
   # Handle source file filtering.
   diff_cmd.append('--')
   diff_cmd += ['*' + ext for ext in CLANG_EXTS]
   diff_output = RunGit(diff_cmd)
 
-  top_dir = RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n')
+  top_dir = os.path.normpath(
+      RunGit(["rev-parse", "--show-toplevel"]).rstrip('\n'))
+
+  # Locate the clang-format binary in the checkout
+  try:
+    clang_format_tool = clang_format.FindClangFormatToolInChromiumTree()
+  except clang_format.NotFoundError, e:
+    DieWithError(e)
 
   if opts.full:
     # diff_output is a list of files to send to clang-format.
     files = diff_output.splitlines()
     if not files:
       print "Nothing to format."
       return 0
-    RunCommand(['clang-format', '-i', '-style', 'Chromium'] + files,
+    RunCommand([clang_format_tool, '-i', '-style', 'Chromium'] + files,
                cwd=top_dir)
   else:
+    env = os.environ.copy()
+    env['PATH'] = os.path.dirname(clang_format_tool)
     # diff_output is a patch to send to clang-format-diff.py
-    cfd_path = os.path.join('/usr', 'lib', 'clang-format',
-                            'clang-format-diff.py')
-    if not os.path.exists(cfd_path):
-      DieWithError('Could not find clang-format-diff at %s.' % cfd_path)
-    cmd = [sys.executable, cfd_path, '-p0', '-style', 'Chromium']
+    try:
+      script = clang_format.FindClangFormatScriptInChromiumTree(
+          'clang-format-diff.py')
+    except clang_format.NotFoundError, e:
+      DieWithError(e)
 
-    # Newer versions of clang-format-diff.py require an explicit -i flag
-    # to apply the edits to files, otherwise it just displays a diff.
-    # Probe the usage string to verify if this is needed.
-    help_text = RunCommand([sys.executable, cfd_path, '-h'])
-    if '[-i]' in help_text:
-      cmd.append('-i')
+    cmd = [sys.executable, script, '-p0', '-style', 'Chromium', '-i']
 
-    RunCommand(cmd, stdin=diff_output, cwd=top_dir)
+    RunCommand(cmd, stdin=diff_output, cwd=top_dir, env=env)
 
   return 0
 
 
 class OptionParser(optparse.OptionParser):
   """Creates the option parse and add --verbose support."""
   def __init__(self, *args, **kwargs):
     optparse.OptionParser.__init__(
         self, *args, prog='git cl', version=__version__, **kwargs)
     self.add_option(
@@ skipping 29 matching lines @@
         ('AppEngine is misbehaving and returned HTTP %d, again. Keep faith '
           'and retry or visit go/isgaeup.\n%s') % (e.code, str(e)))
 
 
 if __name__ == '__main__':
   # These affect sys.stdout so do it outside of main() to simplify mocks in
   # unit testing.
   fix_encoding.fix_encoding()
   colorama.init()
   sys.exit(main(sys.argv[1:]))