Add recursion=n syntax to DEPS files.

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 150 matching lines @@
     self._deps_file = deps_file
     self._url = url
     # 'managed' determines whether or not this dependency is synced/updated by
     # gclient after gclient checks it out initially.  The difference between
     # 'managed' and 'should_process' is that the user specifies 'managed' via
     # the --unmanaged command-line flag or a .gclient config, where
     # 'should_process' is dynamically set by gclient if it goes over its
     # recursion limit and controls gclient's behavior so it does not misbehave.
     self._managed = managed
     self._should_process = should_process
+    # This is a mutable value that overrides the normal recursion limit for this
+    # dependency.  It is read from the actual DEPS file so cannot be set on
+    # class instantiation.
+    # This is currently only supported for top-level deps because gclient does

[M-A Ruel, 2012/10/17 11:08:25]

Interesting note. I would have said it's just fine; when the same exact
dependency is fetched twice, it's creating two independent Dependency instances.

[Isaac (away), 2012/10/17 16:24:02]

Here's an example of what I'm concerned about.  Maybe it will already work, not
sure!

.gclient{
dep1,
dep2,
}
dep1{deps={dep3}}
dep2{deps={dep3}, recursion=2}
dep3{deps={dep4}}

When we process .gclient -> dep1 -> dep3, we are at recursion limit, so do not
process dep4.  When we process .gclient -> dep2, we do not add dep3 a second
time.

dep4 should have be added but will not be.

[M-A Ruel, 2012/10/17 16:57:34]

I'm pretty sure it's handled correctly. "deps3" is loaded two times in the graph
as separate instances. Technically I'd like to see this tested but I won't
require it.

still lgtm.

+    # not have logic for conflict handling where the same dep is specified
+    # twice, one in a non-overriden subtree and one in an overriden subtree.
+    # TODO(ilevy) Add recursion override support for non-top-level deps.
+    self.recursion_override = None
 
     # These are only set in .gclient and not in DEPS files.
     self._custom_vars = custom_vars or {}
     self._custom_deps = custom_deps or {}
 
     # Post process the url to remove trailing slashes.
     if isinstance(self._url, basestring):
       # urls are sometime incorrectly written as proto://host/path/@rev. Replace
       # it to proto://host/path@rev.
       self._url = self._url.replace('/@', '@')
@@ skipping 43 matching lines @@
   def custom_deps(self):
     return self._custom_deps.copy()
 
   @property
   def url(self):
     return self._url
 
   @property
   def recursion_limit(self):
     """Returns > 0 if this dependency is not too recursed to be processed."""
+    if self.recursion_override is not None:
+      return self.recursion_override
     return max(self.parent.recursion_limit - 1, 0)
 
   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)
 
 
@@ skipping 194 matching lines @@
             self.name, self.deps_file, filepath))
     else:
       deps_content = gclient_utils.FileRead(filepath)
       logging.debug('ParseDepsFile(%s) read:\n%s' % (self.name, deps_content))
       # Eval the content.
       try:
         exec(deps_content, global_scope, local_scope)
       except SyntaxError, e:
         gclient_utils.SyntaxErrorToError(filepath, e)
     deps = local_scope.get('deps', {})
+    if 'recursion' in local_scope:

[M-A Ruel, 2012/10/17 11:08:25]

No need to "if" that. local_scope.get('recursion') returns None if the value
doesn't exist, and None means that the value is not overriden.

[Isaac (away), 2012/10/17 16:24:02]

I want the if for the logging line, though.

+      self.recursion_override = local_scope.get('recursion')
+      logging.warning(
+          'Setting %s recursion to %d.', self.name, self.recursion_limit)
     # load os specific dependencies if defined.  these dependencies may
     # override or extend the values defined by the 'deps' member.
     if 'deps_os' in local_scope:
       enforced_os = self.root.enforced_os
       for deps_os_key in enforced_os:
         os_deps = local_scope['deps_os'].get(deps_os_key, {})
         if len(enforced_os) > 1:
           # Ignore any conflict when including deps for more than one
           # platform, so we collect the broadest set of dependencies
           # available. We may end up with the wrong revision of something for
@@ skipping 1175 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: