Fix revinfo with git

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 755 matching lines @@
           else:
             # Delete the entry
             print("\n________ deleting \'%s\' " +
                   "in \'%s\'") % (entry_fixed, self._root_dir)
             gclient_utils.RemoveDirectory(e_dir)
       # record the current list of entries for next time
       self._SaveEntries(entries)
 
   def PrintRevInfo(self):
     """Output revision info mapping for the client and its dependencies. This
-    allows the capture of a overall "revision" for the source tree that can
+    allows the capture of an overall "revision" for the source tree that can
     be used to reproduce the same tree in the future. The actual output
     contains enough information (source paths, svn server urls and revisions)
     that it can be used either to generate external svn commands (without
     gclient) or as input to gclient's --rev option (with some massaging of
     the data).
 
-    NOTE: Unlike RunOnDeps this does not require a local checkout and is run
-    on the Pulse master. It MUST NOT execute hooks.
-
     Raises:
       Error: If the client has conflicting entries.
     """
     # Check for revision overrides.
     revision_overrides = {}
     for revision in self._options.revisions:
       if revision.find("@") < 0:
         raise gclient_utils.Error(
             "Specify the full dependency when specifying a revision number.")
       revision_elem = revision.split("@")
@@ skipping 27 matching lines @@
         else:
           return (url, revision)
 
     # Run on the base solutions first.
     for solution in solutions:
       name = solution["name"]
       if name in entries:
         raise gclient_utils.Error("solution %s specified more than once" % name)
       (url, rev) = GetURLAndRev(name, solution["url"])
       entries[name] = "%s@%s" % (url, rev)
-      # TODO(aharper): SVN/SCMWrapper cleanup (non-local commandset)
-      entries_deps_content[name] = gclient_scm.scm.SVN.Capture(
-                                     ["cat",
-                                      "%s/%s@%s" % (url,
-                                                    self._options.deps_file,
-                                                    rev)],
-                                     os.getcwd())
+      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()
 
     # 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)
-    print(";\n\n".join(["%s: %s" % (x, entries[x])
+    print(";\n".join(["%s: %s" % (x, entries[x])
                         for x in sorted(entries.keys())]))
 
 
 ## gclient commands.
 
 
 def DoCleanup(options, args):
   """Handle the cleanup subcommand.
 
   Raises:
@@ skipping 307 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: