Support passing files/directories to git cl format

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 2285 matching lines @@
 
   change = cl.GetChange(base_branch, None)
   return owners_finder.OwnersFinder(
       [f.LocalPath() for f in
           cl.GetChange(base_branch, None).AffectedFiles()],
       change.RepositoryRoot(), author,
       fopen=file, os_path=os.path, glob=glob.glob,
       disable_color=options.no_color).run()
 
 
+@subcommand.usage('[files or directories to diff]')
 def CMDformat(parser, args):
   """Runs clang-format on the diff."""
   CLANG_EXTS = ['.cc', '.cpp', '.h']
   parser.add_option('--full', action='store_true',
                     help='Reformat the full content of all touched files')
   parser.add_option('--dry-run', action='store_true',
                     help='Don\'t modify any file on disk.')
   opts, args = parser.parse_args(args)
-  if args:
-    parser.error('Unrecognized args: %s' % ' '.join(args))
 
   # git diff generates paths against the root of the repository.  Change
   # to that directory so clang-format can find files even within subdirs.
   rel_base_path = RunGit(['rev-parse', '--show-cdup']).strip()
   if rel_base_path:
     os.chdir(rel_base_path)
 
   # Generate diff for the current branch's changes.
   diff_cmd = ['diff', '--no-ext-diff', '--no-prefix']
   if opts.full:
@@ skipping 15 matching lines @@
     upstream_commit = upstream_commit.strip()
 
   if not upstream_commit:
     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]
+  if args:
+    for arg in args:
+      if os.path.isdir(arg):
+        diff_cmd += [os.path.join(arg, '*' + ext) for ext in CLANG_EXTS]

[iannucci, 2014/01/29 06:06:03]

Is clang format interpreting these globs? Because we don't seem to be running
the command with a shell (unless RunCommand does that by default :(). It may
make sense to use the glob python module here to only pass fully-expanded stuff
on the command line, but if clang-format is expanding these then that's fine too
(if we're relying on the shell to do it, then that's less fine :)).

[enne (OOO), 2014/01/29 18:18:31]

According to
https://www.kernel.org/pub/software/scm/git/docs/gitglossary.html#def_pathspec,
"Paths relative to the directory prefix will be matched against that pattern
using fnmatch(3); in particular, * and ? can match directory separators."

So, I think git is the one interpreting these globs and not the shell or
clang-format.

+      elif os.path.isfile(arg):
+        diff_cmd.append(arg)
+      else:
+        DieWithError('Argument "%s" is not a file or a directory' % arg)
+  else:
+    diff_cmd += ['*' + ext for ext in CLANG_EXTS]
   diff_output = RunGit(diff_cmd)
 
   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)
@@ skipping 67 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:]))