Provide a way to name a solution as part of the config command.

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.
 
 """A wrapper script to manage a set of client modules in different SCM.
 
 This script is intended to be used to help basic management of client
 program sources residing in one or more Subversion modules and Git
 repositories, along with other modules it depends on, also in Subversion or Git,
@@ skipping 135 matching lines @@
 usage: cleanup [options] [--] [svn cleanup args/options]
 
 Valid options:
   --verbose           : output additional diagnostics
 """,
     "config": """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.  Otherwise, a --spec option must be provided.
+URL.  Otherwise, a --spec option must be provided.  A --name option overrides
+the default name for the solutions.
 
 usage: config [option | url] [safesync url]
 
 Valid options:
+  --name path           : alternate relative path for the solution
   --spec=GCLIENT_SPEC   : contents of .gclient are read from string parameter.
                           *Note that due to Cygwin/Python brokenness, it
                           probably can't contain any newlines.*
 
 Examples:
   gclient config https://gclient.googlecode.com/svn/trunk/gclient
       configure a new client to check out gclient.py tool sources
+  gclient config --name tools https://gclient.googlecode.com/svn/trunk/gclient
   gclient config --spec='solutions=[{"name":"gclient","""
     '"url":"https://gclient.googlecode.com/svn/trunk/gclient",'
     '"custom_deps":{}}]',
     "diff": """Display the differences between two revisions of modules.
 (Does 'svn diff' for each checked out module and dependences.)
 Additional args and options to 'svn diff' can be passed after
 gclient options.
 
 usage: diff [options] [--] [svn args/options]
 
@@ skipping 774 matching lines @@
   if len(args) < 1 and not options.spec:
     raise gclient_utils.Error("required argument missing; see 'gclient help "
                               "config'")
   if os.path.exists(options.config_filename):
     raise gclient_utils.Error("%s file already exists in the current directory"
                                   % options.config_filename)
   client = GClient('.', options)
   if options.spec:
     client.SetConfig(options.spec)
   else:
-    # TODO(darin): it would be nice to be able to specify an alternate relpath
-    # for the given URL.
     base_url = args[0].rstrip('/')
-    name = base_url.split("/")[-1]
+    if not options.name:
+      name = base_url.split("/")[-1]
+    else:
+      # specify an alternate relpath for the given URL.
+      name = options.name
     safesync_url = ""
     if len(args) > 1:
       safesync_url = args[1]
     client.SetDefaultConfig(name, base_url, safesync_url)
   client.SaveConfig()
 
 
 def DoExport(options, args):
   """Handle the export subcommand.
 
@@ skipping 221 matching lines @@
   option_parser.add_option("", "--head", action="store_true", default=False,
                            help=("skips any safesync_urls specified in "
                                  "configured solutions"))
   option_parser.add_option("", "--delete_unversioned_trees",
                            action="store_true", default=False,
                            help=("on update, delete any unexpected "
                                  "unversioned trees that are in the checkout"))
   option_parser.add_option("", "--snapshot", action="store_true", default=False,
                            help=("(revinfo only), create a snapshot file "
                                  "of the current version of all repositories"))
+  option_parser.add_option("", "--name",
+                           help="specify alternate relative solution path")
   option_parser.add_option("", "--gclientfile", default=None,
                            metavar="FILENAME",
                            help=("specify an alternate .gclient file"))
 
   if len(argv) < 2:
     # Users don't need to be told to use the 'help' command.
     option_parser.print_help()
     return 1
   # Add manual support for --version as first argument.
   if argv[1] == '--version':
@@ skipping 27 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: