Pass matching file list to the hook in gclient.

gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 37 matching lines @@
     "pattern"  The associated value is a string containing a regular
                expression.  When a file whose pathname matches the expression
                is checked out, updated, or reverted, the hook's "action" will
                run.
     "action"   A list describing a command to run along with its arguments, if
                any.  An action command will run at most one time per gclient
                invocation, regardless of how many files matched the pattern.
                The action is executed in the same directory as the .gclient
                file.  If the first item in the list is the string "python",
                the current Python interpreter (sys.executable) will be used
-               to run the command.
+               to run the command. If the list contains string "$matching_files"
+               it will be removed from the list and the list will be extended
+               by the list of matching files.
 
   Example:
     hooks = [
       { "pattern": "\\.(gif|jpe?g|pr0n|png)$",
         "action":  ["python", "image_indexer.py", "--all"]},
     ]
 """
 
 __author__ = "darinf@gmail.com (Darin Fisher)"
 __version__ = "0.3.2"
@@ skipping 783 matching lines @@
                       "try again." % (url, checkout_path))
         # Ok delete it.
         print("\n_____ switching %s to a new checkout" % self.relpath)
         RemoveDirectory(checkout_path)
         # We need to checkout.
         command = ['checkout', url, checkout_path]
         if revision:
           command.extend(['--revision', str(revision)])
         RunSVNAndGetFileList(command, self._root_dir, file_list)
         return
-          
+
 
     # If the provided url has a revision number that matches the revision
     # number of the existing directory, then we don't need to bother updating.
     if not options.force and from_info['Revision'] == revision:
       if options.verbose or not forced_revision:
         print("\n_____ %s%s" % (self.relpath, rev_str))
       return
 
     command = ["update", checkout_path]
     if revision:
@@ skipping 340 matching lines @@
         if d in deps and deps[d] != url:
           raise Error(
               "Solutions have conflicting versions of dependency \"%s\"" % d)
         if d in solution_urls and solution_urls[d] != url:
           raise Error(
               "Dependency \"%s\" conflicts with specified solution" % d)
         # Grab the dependency.
         deps[d] = url
     return deps
 
-  def _RunHookAction(self, hook_dict):
+  def _RunHookAction(self, hook_dict, matching_file_list):
     """Runs the action from a single hook.
     """
     command = hook_dict['action'][:]
     if command[0] == 'python':
       # If the hook specified "python" as the first item, the action is a
       # Python script.  Run it by starting a new copy of the same
       # interpreter.
       command[0] = sys.executable
 
+    if '$matching_files' in command:
+      command.remove('$matching_files')

[Mark Mentovai, 2009/07/31 19:12:42]

Don't you want to splice matching_file_list into the position where
$matching_files was found?

+      command.extend(matching_file_list)
+
     # Use a discrete exit status code of 2 to indicate that a hook action
     # failed.  Users of this script may wish to treat hook action failures
     # differently from VC failures.
     SubprocessCall(command, self._root_dir, fail_status=2)
 
   def _RunHooks(self, command, file_list, is_using_git):
     """Evaluates all hooks, running actions as needed.
     """
     # Hooks only run for these command types.
     if not command in ('update', 'revert', 'runhooks'):
       return
 
     # Hooks only run when --nohooks is not specified
     if self._options.nohooks:
       return
 
     # Get any hooks from the .gclient file.
     hooks = self.GetVar("hooks", [])
     # Add any hooks found in DEPS files.
     hooks.extend(self._deps_hooks)
 
     # If "--force" was specified, run all hooks regardless of what files have
     # changed.  If the user is using git, then we don't know what files have
     # changed so we always run all hooks.
     if self._options.force or is_using_git:
       for hook_dict in hooks:
-        self._RunHookAction(hook_dict)
+        self._RunHookAction(hook_dict, [])
       return
 
     # Run hooks on the basis of whether the files from the gclient operation
     # match each hook's pattern.
     for hook_dict in hooks:
       pattern = re.compile(hook_dict['pattern'])
-      for file in file_list:
-        if not pattern.search(file):
-          continue
-
-        self._RunHookAction(hook_dict)
-
-        # The hook's action only runs once.  Don't bother looking for any
-        # more matches.
-        break
+      matching_file_list = [file for file in file_list if pattern.search(file)]
+      if matching_file_list:
+        self._RunHookAction(hook_dict, matching_file_list)
 
   def RunOnDeps(self, command, args):
     """Runs a command on each dependency in a client and its dependencies.
 
     The module's dependencies are specified in its top-level DEPS files.
 
     Args:
       command: The command to use (e.g., 'status' or 'diff')
       args: list of str - extra arguments to add to the command line.
 
@@ skipping 260 matching lines @@
     name = base_url.split("/")[-1]
     safesync_url = ""
     if len(args) > 1:
       safesync_url = args[1]
     client.SetDefaultConfig(name, base_url, safesync_url)
   client.SaveConfig()
 
 
 def DoExport(options, args):
   """Handle the export subcommand.
-  
+
   Raises:
     Error: on usage error
   """
   if len(args) != 1:
     raise Error("Need directory name")
   client = GClient.LoadCurrentConfig(options)
 
   if not client:
     raise Error("client not configured; see 'gclient config'")
 
@@ skipping 224 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: