This adds a feature to gclient to allow the (optional) specification of the...

depot_tools/gclient.py

 #!/usr/bin/python
 #
 # Copyright 2008 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
@@ skipping 244 matching lines @@
   --verbose           : output additional diagnostics
 """,
     "revinfo":
     """Outputs source path, server URL and revision information for every
 dependency in all solutions (no local checkout required).
 
 usage: revinfo [options]
 """,
 }
 
-# parameterized by (solution_name, solution_url, safesync_url)
-DEFAULT_CLIENT_FILE_TEXT = (
-    """
-# An element of this array (a \"solution\") describes a repository directory
+DEFAULT_CLIENT_FILE_TEXT = ("""\
+# An element of this array (a "solution") describes a repository directory
 # that will be checked out into your working copy.  Each solution may
 # optionally define additional dependencies (via its DEPS file) to be
 # checked out alongside the solution's directory.  A solution may also
-# specify custom dependencies (via the \"custom_deps\" property) that
+# specify custom dependencies (via the "custom_deps" property) that
 # override or augment the dependencies specified by the DEPS file.
-# If a \"safesync_url\" is specified, it is assumed to reference the location of
+# If a "safesync_url" is specified, it is assumed to reference the location of
 # a text file which contains nothing but the last known good SCM revision to
 # sync against. It is fetched if specified and used unless --head is passed
+
 solutions = [
-  { \"name\"        : \"%s\",
-    \"url\"         : \"%s\",
-    \"custom_deps\" : {
+  { "name"        : "%(solution_name)s",
+    "url"         : "%(solution_url)s",
+    "custom_deps" : {
       # To use the trunk of a component instead of what's in DEPS:
-      #\"component\": \"https://svnserver/component/trunk/\",
+      #"component": "https://svnserver/component/trunk/",
       # To exclude a component from your working copy:
-      #\"data/really_large_component\": None,
+      #"data/really_large_component": None,
     },
-    \"safesync_url\": \"%s\"
-  }
+    "safesync_url": "%(safesync_url)s"
+  },
 ]
 """)
 
 
 ## Generic utils
 
 def ParseXML(output):
   try:
     return xml.dom.minidom.parseString(output)
   except xml.parsers.expat.ExpatError:
@@ skipping 826 matching lines @@
     while not os.path.exists(os.path.join(path, options.config_filename)):
       next = os.path.split(path)
       if not next[1]:
         return None
       path = next[0]
     client = GClient(path, options)
     client._LoadConfig()
     return client
 
   def SetDefaultConfig(self, solution_name, solution_url, safesync_url):
-    self.SetConfig(DEFAULT_CLIENT_FILE_TEXT % (
-      solution_name, solution_url, safesync_url
-    ))
+    self.SetConfig(DEFAULT_CLIENT_FILE_TEXT % {
+      'solution_name': solution_name,
+      'solution_url': solution_url,
+      'safesync_url' : safesync_url,
+    })
 
   def _SaveEntries(self, entries):
     """Creates a .gclient_entries file to record the list of unique checkouts.
 
     The .gclient_entries file lives in the same directory as .gclient.
 
     Args:
       entries: A sequence of solution names.
     """
     text = "entries = [\n"
@@ skipping 277 matching lines @@
     # All known hooks are expected to run unconditionally regardless of working
     # copy state, so skip the SCM status check.
     run_scm = not (command == 'runhooks' and self._options.force)
 
     entries = {}
     entries_deps_content = {}
     file_list = []
     # Run on the base solutions first.
     for solution in solutions:
       name = solution["name"]
+      deps_file = solution.get("deps_file", self._options.deps_file)
+      if '/' in deps_file or '\\' in deps_file:
+        raise Error("deps_file name must not be a path, just a filename.")
       if name in entries:
         raise Error("solution %s specified more than once" % name)
       url = solution["url"]
       entries[name] = url
       if run_scm:
         self._options.revision = revision_overrides.get(name)
         scm = SCMWrapper(url, self._root_dir, name)
         scm.RunCommand(command, self._options, args, file_list)
         file_list = [os.path.join(name, file.strip()) for file in file_list]
         self._options.revision = None
       try:
         deps_content = FileRead(os.path.join(self._root_dir, name,
-                                             self._options.deps_file))
+                                             deps_file))
       except IOError, e:
         if e.errno != errno.ENOENT:
           raise
         deps_content = ""
       entries_deps_content[name] = deps_content
 
     # Process the dependencies next (sort alphanumerically to ensure that
     # containing directories get populated first and for readability)
     deps = self._ParseAllDeps(entries, entries_deps_content)
     deps_to_process = deps.keys()
@@ skipping 19 matching lines @@
                                                  deps[d].module_name,
                                                  self._options.deps_file)),
                            {})
         url = sub_deps[d]
         entries[d] = url
         if run_scm:
           self._options.revision = revision_overrides.get(d)
           scm = SCMWrapper(url, self._root_dir, d)
           scm.RunCommand(command, self._options, args, file_list)
           self._options.revision = None
-    
+
     # Convert all absolute paths to relative.
     for i in range(len(file_list)):
       # TODO(phajdan.jr): We should know exactly when the paths are absolute.
       # It depends on the command being executed (like runhooks vs sync).
       if not os.path.isabs(file_list[i]):
         continue
 
       prefix = os.path.commonprefix([self._root_dir.lower(),
                                      file_list[i].lower()])
       file_list[i] = file_list[i][len(prefix):]
@@ skipping 447 matching lines @@
 
 if "__main__" == __name__:
   try:
     result = Main(sys.argv)
   except Error, e:
     print >> sys.stderr, "Error: %s" % str(e)
     result = 1
   sys.exit(result)
 
 # vim: ts=2:sw=2:tw=80:et: