Refactor SubprocessCallAndFilter() to remove positional arguments.

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 433 matching lines @@
       # interpreter.
       command[0] = sys.executable
 
     if '$matching_files' in command:
       splice_index = command.index('$matching_files')
       command[splice_index:splice_index + 1] = 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.
-    return gclient_utils.SubprocessCall(command, self.root_dir(), fail_status=2)
+    return gclient_utils.SubprocessCall(command, cwd=self.root_dir(),
+        fail_status=2)
 
   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
 
@@ skipping 133 matching lines @@
             s.get('safesync_url', None),
             s.get('custom_deps', {}),
             s.get('custom_vars', {}),
             None,
             True))
       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', [])
-    self.direct_reference = True
     self.deps_parsed = True
 
   def SaveConfig(self):
     gclient_utils.FileWrite(os.path.join(self.root_dir(),
                                          self._options.config_filename),
                             self.config_content)
 
   @staticmethod
   def LoadCurrentConfig(options):
     """Searches for and loads a .gclient file relative to the current working
@@ skipping 255 matching lines @@
   for scm in options.scm:
     scm_set.update(scm.split(','))
 
   # Pass in the SCM type as an env variable
   env = os.environ.copy()
 
   for path, url in entries.iteritems():
     scm = gclient_scm.GetScmName(url)
     if scm_set and scm not in scm_set:
       continue
-    dir = os.path.normpath(os.path.join(root, path))
+    cwd = os.path.normpath(os.path.join(root, path))
     env['GCLIENT_SCM'] = scm
     env['GCLIENT_URL'] = url
-    subprocess.Popen(args, cwd=dir, env=env).communicate()
+    subprocess.Popen(args, cwd=cwd, env=env).communicate()
 
 
 @attr('usage', '[url] [safesync url]')
 def CMDconfig(parser, args):
   """Create a .gclient file in the current directory.
 
 This specifies the configuration for further commands. After update/sync,
 top-level DEPS files in each module are read to determine dependent
 modules to operate on as well. If optional [url] parameter is
 provided, then configuration is read from a specified Subversion server
@@ skipping 326 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: