Remove default arguments to Dependency.__init__().

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 119 matching lines @@
         return self._custom_vars[var_name]
       elif var_name in self._local_scope.get("vars", {}):
         return self._local_scope["vars"][var_name]
       raise gclient_utils.Error("Var is not defined: %s" % var_name)
 
 
 class Dependency(GClientKeywords):
   """Object that represents a dependency checkout."""
   DEPS_FILE = 'DEPS'
 
-  def __init__(self, parent, name, url, safesync_url=None, custom_deps=None,
-               custom_vars=None, deps_file=None):
+  def __init__(self, parent, name, url, safesync_url, custom_deps,
+               custom_vars, deps_file):
     GClientKeywords.__init__(self)
     self.parent = parent
     self.name = name
     self.url = url
     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 = []
@@ skipping 138 matching lines @@
       for d, url in deps.items():
         # normpath is required to allow DEPS to use .. in their
         # dependency local path.
         rel_deps[os.path.normpath(os.path.join(self.name, d))] = url
       deps = rel_deps
 
     # Convert the deps into real Dependency.
     for name, url in deps.iteritems():
       if name in [s.name for s in self.dependencies]:
         raise
-      self.dependencies.append(Dependency(self, name, url))
+      self.dependencies.append(Dependency(self, name, url, None, None, None,
+          None))
     # 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 == []
     # When running runhooks, there's no need to consult the SCM.
@@ skipping 104 matching lines @@
 
   def root_dir(self):
     return self.parent.root_dir()
 
   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 tree(self, include_all):
+    return self.parent.tree(include_all)
 
-  def subtree(self, force_all):
+  def subtree(self, include_all):
     result = []
     # Add breadth-first.
-    if self.direct_reference or force_all:
+    if self.direct_reference or include_all:
       for d in self.dependencies:
         result.append(d)
       for d in self.dependencies:
-        result.extend(d.subtree(force_all))
+        result.extend(d.subtree(include_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):
@@ skipping 63 matching lines @@
   },
 """)
 
   DEFAULT_SNAPSHOT_FILE_TEXT = ("""\
 # Snapshot generated with gclient revinfo --snapshot
 solutions = [
 %(solution_list)s]
 """)
 
   def __init__(self, root_dir, options):
-    Dependency.__init__(self, None, None, None)
+    # Do not change previous behavior. Only solution level and immediate DEPS
+    # are processed.
+    self._recursion_limit = 2
+    Dependency.__init__(self, None, None, None, None, None, None, None)
     self._options = options
     if options.deps_os:
       enforced_os = options.deps_os.split(',')
     else:
       enforced_os = [self.DEPS_OS_CHOICES.get(sys.platform, 'unix')]
     if 'all' in enforced_os:
       enforced_os = self.DEPS_OS_CHOICES.itervalues()
     self._enforced_os = list(set(enforced_os))
     self._root_dir = root_dir
     self.config_content = None
-    # Do not change previous behavior. Only solution level and immediate DEPS
-    # are processed.
-    self._recursion_limit = 2
 
   def SetConfig(self, content):
     assert self.dependencies == []
     config_dict = {}
     self.config_content = content
     try:
       exec(content, config_dict)
     except SyntaxError, e:
       gclient_utils.SyntaxErrorToError('.gclient', e)
     for s in config_dict.get('solutions', []):
       try:
         self.dependencies.append(Dependency(
             self, s['name'], s['url'],
             s.get('safesync_url', None),
             s.get('custom_deps', {}),
-            s.get('custom_vars', {})))
+            s.get('custom_vars', {}),
+            None))
       except KeyError:
         raise gclient_utils.Error('Invalid .gclient file. Solution is '
                                   'incomplete: %s' % s)
     # .gclient can have hooks.
     self.deps_hooks = config_dict.get('hooks', [])
 
   def SaveConfig(self):
     gclient_utils.FileWrite(os.path.join(self.root_dir(),
                                          self._options.config_filename),
                             self.config_content)
@@ skipping 210 matching lines @@
     return self._root_dir
 
   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):
+  def tree(self, include_all):
     """Returns a flat list of all the dependencies."""
-    return self.subtree(force_all)
+    return self.subtree(include_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: