gclient grep: support pathspec arguments

gclient.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.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 623 matching lines @@
         # Skip file only checkout.
         scm = gclient_scm.GetScmName(parsed_url)
         if not options.scm or scm in options.scm:
           cwd = os.path.normpath(os.path.join(self.root.root_dir, self.name))
           # Pass in the SCM type as an env variable
           env = os.environ.copy()
           if scm:
             env['GCLIENT_SCM'] = scm
           if parsed_url:
             env['GCLIENT_URL'] = parsed_url
-          if options.prepend_dir:
+          if options.prepend_dir and scm == 'git':
             print_stdout = False
             def filter_fn(line):
+              """Git-specific path marshaling. It is optimized for git-grep."""
+
+              def mod_path(git_pathspec):
+                match = re.match('^(\S+?:)?([^\0]+)$', git_pathspec)

[M-A Ruel, 2012/11/28 02:20:33]

Then concatenate the two strings to make it clear or properly escape the \, e.g.
\\S

+                modified_path = os.path.join(self.name, match.group(2))
+                branch = match.group(1) or ''
+                return '%s%s' % (branch, modified_path)
+
+              match = re.match('^Binary file ([^\0]+) matches$', line)
+              if match:
+                print 'Binary file %s matches' % mod_path(match.group(1))
+                return
+
               items = line.split('\0')
-              if len(items) == 1:
-                match = re.match('Binary file (.*) matches$', line)
-                if match:
-                  print 'Binary file %s matches' % os.path.join(
-                      self.name, match.group(1))
-                else:
-                  print line
-              elif len(items) == 2 and items[1]:
-                print '%s : %s' % (os.path.join(self.name, items[0]), items[1])
-              else:
+              if len(items) == 2 and items[1]:
+                print '%s : %s' % (mod_path(items[0]), items[1])
+              elif len(items) >= 2:
                 # Multiple null bytes or a single trailing null byte indicate
                 # git is likely displaying filenames only (such as with -l)
-                print '\n'.join(os.path.join(self.name, f) for f in items if f)
+                print '\n'.join(mod_path(path) for path in items if path)
+              else:
+                print line
           else:
             print_stdout = True
             filter_fn = None
 
           if os.path.isdir(cwd):
             try:
               gclient_utils.CheckCallAndFilter(
                   args, cwd=cwd, env=env, print_stdout=print_stdout,
                   filter_fn=filter_fn,
                   )
@@ skipping 1068 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: