Add testing for the From(File()) case, fix revinfo.

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.
 
 """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 732 matching lines @@
     # containing directories get populated first and for readability)
     deps = self._ParseAllDeps(entries)
     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)
+      elif isinstance(deps[d], self.FileImpl):
+        (url, rev) = GetURLAndRev(d, deps[d].file_location)

[tony, 2010/07/12 17:26:59]

Nit: parens on the left are not needed (although I guess it's ok to keep them if
you want to match the block above).

[M-A Ruel, 2010/07/12 17:29:49]

All this code will be deleted anyway.

+        entries[d] = "%s@%s" % (url, rev)
 
     # Second pass for inherited deps (via the From keyword)
     for d in deps_to_process:
       if isinstance(deps[d], self.FromImpl):
         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)
         sub_deps_base_url = deps[deps[d].module_name]
         sub_deps = Dependency(self, deps[d].module_name, sub_deps_base_url
@@ skipping 436 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: