Add --jobs support to gclient. --jobs=1 is still the default for now.

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 31 matching lines @@
                it will be removed from the list and the list will be extended
                by the list of matching files.
 
   Example:
     hooks = [
       { "pattern": "\\.(gif|jpe?g|pr0n|png)$",
         "action":  ["python", "image_indexer.py", "--all"]},
     ]
 """
 
-__version__ = "0.5.2"
+__version__ = "0.6"
 
+import copy
 import logging
 import optparse
 import os
 import posixpath
 import pprint
 import re
 import subprocess
 import sys
 import urlparse
 import urllib
@@ skipping 284 matching lines @@
         # 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)
       else:
+        # Create a shallow copy to mutate revision.
+        options = copy.copy(options)
         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]
-      options.revision = None
     self.processed = True
     if self.recursion_limit() > 0:
       # Then we can parse the DEPS file.
       self.ParseDepsFile()
       # Adjust the implicit dependency requirement; e.g. if a DEPS file contains
       # both src/foo and src/foo/bar, src/foo/bar is implicitly dependent of
       # src/foo. Yes, it's O(n^2)... It's important to do that before
       # enqueueing them.
       for s in self.dependencies:
         for s2 in self.dependencies:
@@ skipping 329 matching lines @@
     Args:
       command: The command to use (e.g., 'status' or 'diff')
       args: list of str - extra arguments to add to the command line.
     """
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
     revision_overrides = self._EnforceRevisions()
     pm = None
     if command == 'update' and not self._options.verbose:
       pm = Progress('Syncing projects', 1)
-    work_queue = gclient_utils.ExecutionQueue(pm)
+    work_queue = gclient_utils.ExecutionQueue(self._options.jobs, pm)
     for s in self.dependencies:
       work_queue.enqueue(s)
     work_queue.flush(self._options, revision_overrides, command, args,
         work_queue)
 
     # Once all the dependencies have been processed, it's now safe to run the
     # hooks.
     if not self._options.nohooks:
       self.RunHooksRecursively(self._options)
 
@@ skipping 24 matching lines @@
                 entry_fixed, self.root_dir()))
             gclient_utils.RemoveDirectory(e_dir)
       # record the current list of entries for next time
       self._SaveEntries()
     return 0
 
   def PrintRevInfo(self):
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
     # Load all the settings.
-    work_queue = gclient_utils.ExecutionQueue(None)
+    work_queue = gclient_utils.ExecutionQueue(self._options.jobs, None)
     for s in self.dependencies:
       work_queue.enqueue(s)
     work_queue.flush(self._options, {}, None, [], work_queue)
 
     def GetURLAndRev(dep):
       """Returns the revision-qualified SCM url for a Dependency."""
       if dep.parsed_url is None:
         return None
       if isinstance(dep.parsed_url, self.FileImpl):
         original_url = dep.parsed_url.file_location
@@ skipping 392 matching lines @@
 
 def Main(argv):
   """Doesn't parse the arguments here, just find the right subcommand to
   execute."""
   try:
     # Do it late so all commands are listed.
     CMDhelp.usage = ('\n\nCommands are:\n' + '\n'.join([
         '  %-10s %s' % (fn[3:], Command(fn[3:]).__doc__.split('\n')[0].strip())
         for fn in dir(sys.modules[__name__]) if fn.startswith('CMD')]))
     parser = optparse.OptionParser(version='%prog ' + __version__)
+    parser.add_option('-j', '--jobs', default=1, type='int',
+                      help='Specify how many SCM commands can run in parallel')
     parser.add_option('-v', '--verbose', action='count', default=0,
                       help='Produces additional output for diagnostics. Can be '
                            'used up to three times for more logging info.')
     parser.add_option('--gclientfile', dest='config_filename',
                       default=os.environ.get('GCLIENT_FILE', '.gclient'),
                       help='Specify an alternate %default file')
     # Integrate standard options processing.
     old_parser = parser.parse_args
     def Parse(args):
       (options, args) = old_parser(args)
       level = None
       if options.verbose == 2:
         level = logging.INFO
       elif options.verbose > 2:
         level = logging.DEBUG
       logging.basicConfig(level=level,
           format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
       options.entries_filename = options.config_filename + '_entries'
+      if options.jobs < 1:
+        parser.error('--jobs must be 1 or higher')
 
       # These hacks need to die.
       if not hasattr(options, 'revisions'):
         # GClient.RunOnDeps expects it even if not applicable.
         options.revisions = []
       if not hasattr(options, 'head'):
         options.head = None
       if not hasattr(options, 'nohooks'):
         options.nohooks = True
       if not hasattr(options, 'deps_os'):
@@ skipping 17 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: