Make Dependency.subtree() a standalone function for later use.

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 404 matching lines @@
 
   def enforced_os(self):
     return self.parent.enforced_os()
 
   def recursion_limit(self):
     return self.parent.recursion_limit() - 1
 
   def tree(self, force_all):
     return self.parent.tree(force_all)
 
+  def subtree(self, force_all):
+    result = []
+    # Add breadth-first.
+    if self.direct_reference or force_all:
+      for d in self.dependencies:
+          result.append(d)

[bradn, 2010/07/22 21:51:49]

extra indent here.

+      for d in self.dependencies:
+        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 __str__(self):
     out = []
     for i in ('name', 'url', 'safesync_url', 'custom_deps', 'custom_vars',
@@ skipping 317 matching lines @@
   def enforced_os(self):
     """What deps_os entries that are to be parsed."""
     return self._enforced_os
 
   def recursion_limit(self):
     """How recursive can each dependencies in DEPS file can load DEPS file."""
     return self._recursion_limit
 
   def tree(self, force_all):
     """Returns a flat list of all the dependencies."""
-    def subtree(dep):
-      if not force_all and not dep.direct_reference:
-        # Was loaded from a From() keyword in a DEPS file, don't load all its
-        # dependencies.
-        return []
-      result = dep.dependencies[:]
-      for d in dep.dependencies:
-        result.extend(subtree(d))
-      return result
-    return subtree(self)
+    return self.subtree(force_all)
 
 
 #### gclient commands.
 
 
 def CMDcleanup(parser, args):
   """Cleans up all working copies.
 
 Mostly svn-specific. Simply runs 'svn cleanup' for each module.
 """
@@ skipping 368 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: