Add --spec to the default parameter list.

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 864 matching lines @@
 
   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
     dir. Returns a GClient object."""
-    path = gclient_utils.FindGclientRoot(os.getcwd(), options.config_filename)
-    if not path:
-      return None
-    client = GClient(path, options)
-    client.SetConfig(gclient_utils.FileRead(
-        os.path.join(path, options.config_filename)))
+    if options.spec:
+      client = GClient('.', options)
+      client.SetConfig(options.spec)
+    else:
+      path = gclient_utils.FindGclientRoot(os.getcwd(), options.config_filename)
+      if not path:
+        return None
+      client = GClient(path, options)
+      client.SetConfig(gclient_utils.FileRead(
+          os.path.join(path, options.config_filename)))
 
     if (options.revisions and
         len(client.dependencies) > 1 and
         any('@' not in r for r in options.revisions)):
       print >> sys.stderr, (
           'You must specify the full solution name like --revision %s@%s\n'
           'when you have multiple solutions setup in your .gclient file.\n'
           'Other solutions present are: %s.') % (
               client.dependencies[0].name,
               options.revisions[0],
@@ skipping 313 matching lines @@
 @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
 URL.
 """
-  parser.add_option('--spec',
-                    help='create a gclient file containing the provided '
-                         'string. Due to Cygwin/Python brokenness, it '
-                         'probably can\'t contain any newlines.')
+
+  # We do a little dance with the --gclientfile option.  'gclient config' is the
+  # only command where it's acceptable to have both '--gclientfile' and '--spec'
+  # arguments.  So, we temporarily stash any --gclientfile parameter into
+  # options.output_config_file until after the (gclientfile xor spec) error
+  # check.
+  parser.remove_option('--gclientfile')
+  parser.add_option('--gclientfile', dest='output_config_file',
+                    help='Specify an alternate .gclient file')
   parser.add_option('--name',
                     help='overrides the default name for the solution')
   parser.add_option('--deps-file', default='DEPS',
                     help='overrides the default name for the DEPS file for the'
                          'main solutions and all sub-dependencies')
   parser.add_option('--unmanaged', action='store_true', default=False,
                     help='overrides the default behavior to make it possible '
                          'to have the main solution untouched by gclient '
                          '(gclient will check out unmanaged dependencies but '
                          'will never sync them)')
   parser.add_option('--git-deps', action='store_true',
                     help='sets the deps file to ".DEPS.git" instead of "DEPS"')
+  parser.set_defaults(config_filename=None)
   (options, args) = parser.parse_args(args)
+  if options.output_config_file:
+    setattr(options, 'config_filename', getattr(options, 'output_config_file'))
   if ((options.spec and args) or len(args) > 2 or
       (not options.spec and not args)):
     parser.error('Inconsistent arguments. Use either --spec or one or 2 args')
 
   client = GClient('.', options)
   if options.spec:
     client.SetConfig(options.spec)
   else:
     base_url = args[0].rstrip('/')
     if not options.name:
@@ skipping 262 matching lines @@
 
 
 def Parser():
   """Returns the default parser."""
   parser = optparse.OptionParser(version='%prog ' + __version__)
   # some arm boards have issues with parallel sync.
   if platform.machine().startswith('arm'):
     jobs = 1
   else:
     jobs = 8
+  gclientfile_default = os.environ.get('GCLIENT_FILE', '.gclient')
   parser.add_option('-j', '--jobs', default=jobs, type='int',
                     help='Specify how many SCM commands can run in parallel; '
                           'default=%default')
   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')
+                    default=None,
+                    help='Specify an alternate %s file' % gclientfile_default)
+  parser.add_option('--spec',
+                    default=None,
+                    help='create a gclient file containing the provided '
+                         'string. Due to Cygwin/Python brokenness, it '
+                         'probably can\'t contain any newlines.')
   # Integrate standard options processing.
   old_parser = parser.parse_args
   def Parse(args):
     (options, args) = old_parser(args)
     level = [logging.ERROR, logging.WARNING, logging.INFO, logging.DEBUG][
         min(options.verbose, 3)]
     logging.basicConfig(level=level,
         format='%(module)s(%(lineno)d) %(funcName)s:%(message)s')
+    if options.config_filename and options.spec:
+      parser.error('Cannot specifiy both --gclientfile and --spec')
+    if not options.config_filename:
+      options.config_filename = gclientfile_default
     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
@@ skipping 51 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: