Make file_list recursive so that pattern in hooks will trigger on dependencies too.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 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 135 matching lines @@
     self.parsed_url = None
     # These 2 are only set in .gclient and not in DEPS files.
     self.safesync_url = safesync_url
     self.custom_vars = custom_vars or {}
     self.custom_deps = custom_deps or {}
     self.deps_hooks = []
     self.dependencies = []
     self.deps_file = deps_file or self.DEPS_FILE
     # A cache of the files affected by the current operation, necessary for
     # hooks.
-    self.file_list = []
+    self._file_list = []
     # If it is not set to True, the dependency wasn't processed for its child
     # dependency, i.e. its DEPS wasn't read.
     self.deps_parsed = False
     # A direct reference is dependency that is referenced by a deps, deps_os or
     # solution. A indirect one is one that was loaded with From() or that
     # exceeded recursion limit.
     self.direct_reference = False
 
     # Sanity checks
     if not self.name and self.parent:
@@ skipping 130 matching lines @@
         raise
       self.dependencies.append(Dependency(self, name, url))
     # Sort by name.
     self.dependencies.sort(key=lambda x: x.name)
     logging.info('Loaded: %s' % str(self))
 
   def RunCommandRecursively(self, options, revision_overrides,
                             command, args, pm):
     """Runs 'command' before parsing the DEPS in case it's a initial checkout
     or a revert."""
-    assert self.file_list == []
+    assert self._file_list == []
     # When running runhooks, there's no need to consult the SCM.
     # All known hooks are expected to run unconditionally regardless of working
     # copy state, so skip the SCM status check.
     run_scm = command not in ('runhooks', None)
     self.LateOverride(self.url)
     if run_scm and self.parsed_url:
       if isinstance(self.parsed_url, self.FileImpl):
         # Special support for single-file checkout.
         if not command in (None, 'cleanup', 'diff', 'pack', 'status'):
           options.revision = self.parsed_url.GetRevision()
           scm = gclient_scm.SVNWrapper(self.parsed_url.GetPath(),
                                        self.root_dir(),
                                        self.name)
           scm.RunCommand('updatesingle', options,
                          args + [self.parsed_url.GetFilename()],
-                         self.file_list)
+                         self._file_list)
       else:
         options.revision = revision_overrides.get(self.name)
         scm = gclient_scm.CreateSCM(self.parsed_url, self.root_dir(), self.name)
-        scm.RunCommand(command, options, args, self.file_list)
-        self.file_list = [os.path.join(self.name, f.strip())
-                          for f in self.file_list]
+        scm.RunCommand(command, options, args, self._file_list)
+        self._file_list = [os.path.join(self.name, f.strip())
+                           for f in self._file_list]
       options.revision = None
     if pm:
       # The + 1 comes from the fact that .gclient is considered a step in
       # itself, .i.e. this code is called one time for the .gclient. This is not
       # conceptually correct but it simplifies code.
       pm._total = len(self.tree(False)) + 1
       pm.update()
     if self.recursion_limit():
       # Then we can parse the DEPS file.
       self.ParseDepsFile(True)
@@ skipping 18 matching lines @@
       # that.
       if (options.force or
           isinstance(self.parsed_url, self.FileImpl) or
           gclient_scm.GetScmName(self.parsed_url) in ('git', None) or
           os.path.isdir(os.path.join(self.root_dir(), self.name, '.git'))):
         for hook_dict in self.deps_hooks:
           self._RunHookAction(hook_dict, [])
       else:
         # TODO(phajdan.jr): We should know exactly when the paths are absolute.
         # Convert all absolute paths to relative.
-        for i in range(len(self.file_list)):
+        file_list = self.file_list()
+        for i in range(len(file_list)):
           # It depends on the command being executed (like runhooks vs sync).
-          if not os.path.isabs(self.file_list[i]):
+          if not os.path.isabs(file_list[i]):
             continue
 
           prefix = os.path.commonprefix([self.root_dir().lower(),
-                                        self.file_list[i].lower()])
-          self.file_list[i] = self.file_list[i][len(prefix):]
+                                         file_list[i].lower()])
+          file_list[i] = file_list[i][len(prefix):]
 
           # Strip any leading path separators.
-          while (self.file_list[i].startswith('\\') or
-                 self.file_list[i].startswith('/')):
-            self.file_list[i] = self.file_list[i][1:]
+          while (file_list[i].startswith('\\') or
+                 file_list[i].startswith('/')):
+            file_list[i] = file_list[i][1:]
 
         # Run hooks on the basis of whether the files from the gclient operation
         # match each hook's pattern.
         for hook_dict in self.deps_hooks:
           pattern = re.compile(hook_dict['pattern'])
-          matching_file_list = [f for f in self.file_list if pattern.search(f)]
+          matching_file_list = [f for f in file_list if pattern.search(f)]
           if matching_file_list:
             self._RunHookAction(hook_dict, matching_file_list)
     if self.recursion_limit():
       for s in self.dependencies:
         s.RunHooksRecursively(options)
 
   def _RunHookAction(self, hook_dict, matching_file_list):
     """Runs the action from a single hook."""
     logging.info(hook_dict)
     logging.info(matching_file_list)
@@ skipping 35 matching lines @@
         result.extend(d.subtree(force_all))
     return result
 
   def get_custom_deps(self, name, url):
     """Returns a custom deps if applicable."""
     if self.parent:
       url = self.parent.get_custom_deps(name, url)
     # None is a valid return value to disable a dependency.
     return self.custom_deps.get(name, url)
 
+  def file_list(self):
+    result = self._file_list[:]
+    for d in self.dependencies:
+      result.extend(d.file_list())
+    return result
+
   def __str__(self):
     out = []
     for i in ('name', 'url', 'safesync_url', 'custom_deps', 'custom_vars',
-              'deps_hooks', 'file_list'):
+              'deps_hooks', '_file_list'):
       # 'deps_file'
       if self.__dict__[i]:
         out.append('%s: %s' % (i, self.__dict__[i]))
 
     for d in self.dependencies:
       out.extend(['  ' + x for x in str(d).splitlines()])
       out.append('')
     return '\n'.join(out)
 
   def __repr__(self):
@@ skipping 695 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: