r41078 broke revinfo for .gclient files with multiple solutions

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 829 matching lines @@
       else:
         if revision_overrides.has_key(name):
           return (url, revision_overrides[name])
         else:
           return (url, revision)
 
     # text of the snapshot gclient file
     new_gclient = ""
     # Dictionary of { path : SCM url } to ensure no duplicate solutions
     solution_names = {}
+    entries = {}
+    entries_deps_content = {}
     # Run on the base solutions first.
     for solution in solutions:
       # Dictionary of { path : SCM url } to describe the gclient checkout
-      entries = {}
-      entries_deps_content = {}
       name = solution["name"]
       if name in solution_names:
         raise gclient_utils.Error("solution %s specified more than once" % name)
       (url, rev) = GetURLAndRev(name, solution["url"])
       entries[name] = "%s@%s" % (url, rev)
       solution_names[name] = "%s@%s" % (url, rev)
       deps_file = solution.get("deps_file", self._options.deps_file)
       if '/' in deps_file or '\\' in deps_file:
         raise gclient_utils.Error('deps_file name must not be a path, just a '
                                   'filename.')
       try:
         deps_content = gclient_utils.FileRead(
             os.path.join(self._root_dir, name, 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()
-      deps_to_process.sort()
+    # Process the dependencies next (sort alphanumerically to ensure that
+    # containing directories get populated first and for readability)
+# DEBUG

[M-A Ruel, 2010/03/11 23:46:07]

Remove this please.

+    #print "entries\n%s\nentries_deps_content\n%s" % (entries, entries_deps_content)
+# END DEBUG
+    deps = self._ParseAllDeps(entries, entries_deps_content)
+    deps_to_process = deps.keys()
+    deps_to_process.sort()
 
-      # First pass for direct dependencies.
-      for d in deps_to_process:
-        if type(deps[d]) == str:
-          (url, rev) = GetURLAndRev(d, deps[d])
-          entries[d] = "%s@%s" % (url, rev)
+    # First pass for direct dependencies.
+    for d in deps_to_process:
+      if type(deps[d]) == str:
+        (url, rev) = GetURLAndRev(d, deps[d])
+        entries[d] = "%s@%s" % (url, rev)
 
-      # Second pass for inherited deps (via the From keyword)
-      for d in deps_to_process:
-        if type(deps[d]) != str:
-          deps_parent_url = entries[deps[d].module_name]
-          if deps_parent_url.find("@") < 0:
-            raise gclient_utils.Error("From %s missing revisioned url" %
-                                          deps[d].module_name)
-          content =  gclient_utils.FileRead(os.path.join(
-                                              self._root_dir,
-                                              deps[d].module_name,
-                                              self._options.deps_file))
-          sub_deps = self._ParseSolutionDeps(deps[d].module_name, content, {})
-          (url, rev) = GetURLAndRev(d, sub_deps[d])
-          entries[d] = "%s@%s" % (url, rev)
+    # Second pass for inherited deps (via the From keyword)
+    for d in deps_to_process:
+      if type(deps[d]) != str:
+        deps_parent_url = entries[deps[d].module_name]
+        if deps_parent_url.find("@") < 0:
+          raise gclient_utils.Error("From %s missing revisioned url" %
+                                        deps[d].module_name)
+        content =  gclient_utils.FileRead(os.path.join(
+                                            self._root_dir,
+                                            deps[d].module_name,
+                                            self._options.deps_file))
+        sub_deps = self._ParseSolutionDeps(deps[d].module_name, content, {})
+        (url, rev) = GetURLAndRev(d, sub_deps[d])
+        entries[d] = "%s@%s" % (url, rev)
 
-      # Build the snapshot configuration string
-      if self._options.snapshot:
-        url = entries.pop(name)
-        custom_deps = ",\n      ".join(["\"%s\": \"%s\"" % (x, entries[x])
-                                        for x in sorted(entries.keys())])
+    # Build the snapshot configuration string
+    if self._options.snapshot:
+      url = entries.pop(name)
+      custom_deps = ",\n      ".join(["\"%s\": \"%s\"" % (x, entries[x])
+                                      for x in sorted(entries.keys())])
 
-        new_gclient += DEFAULT_SNAPSHOT_SOLUTION_TEXT % {
-                       'solution_name': name,
-                       'solution_url': url,
-                       'safesync_url' : "",
-                       'solution_deps': custom_deps,
-                       }
-      else:
-        print(";\n".join(["%s: %s" % (x, entries[x])
-                         for x in sorted(entries.keys())]))
+      new_gclient += DEFAULT_SNAPSHOT_SOLUTION_TEXT % {
+                     'solution_name': name,
+                     'solution_url': url,
+                     'safesync_url' : "",
+                     'solution_deps': custom_deps,
+                     }
+    else:
+      print(";\n".join(["%s: %s" % (x, entries[x])
+                       for x in sorted(entries.keys())]))
 
     # Print the snapshot configuration file
     if self._options.snapshot:
       config = DEFAULT_SNAPSHOT_FILE_TEXT % {'solution_list': new_gclient}
       snapclient = GClient(self._root_dir, self._options)
       snapclient.SetConfig(config)
       print(snapclient._config_content)
 
 
 ## gclient commands.
@@ skipping 321 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: