Add testing for a solution entry where url = None.

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 702 matching lines @@
     number or a git hash. A git branch name isn't "pinned" since the actual
     commit can change.
 
     The --snapshot option allows creating a .gclient file to reproduce the tree.
     """
     if not self.dependencies:
       raise gclient_utils.Error('No solution specified')
 
     # Inner helper to generate base url and rev tuple
     def GetURLAndRev(name, original_url):
+      if not original_url:
+        return None
       url, _ = gclient_utils.SplitUrlRevision(original_url)
       scm = gclient_scm.CreateSCM(original_url, self.root_dir(), name)
-      return (url, scm.revinfo(self._options, [], None))
+      return '%s@%s' % (url, scm.revinfo(self._options, [], None))
 
     # text of the snapshot gclient file
     new_gclient = ""
     # Dictionary of { path : SCM url } to ensure no duplicate solutions
     solution_names = {}
     entries = {}
     # Run on the base solutions first.
     for solution in self.dependencies:
       # Dictionary of { path : SCM url } to describe the gclient checkout
       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)
+      url = GetURLAndRev(name, solution.url)
+      entries[name] = url
+      solution_names[name] = url
 
     # Process the dependencies next (sort alphanumerically to ensure that
     # 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)
+        entries[d] = GetURLAndRev(d, deps[d])
       elif isinstance(deps[d], self.FileImpl):
-        (url, rev) = GetURLAndRev(d, deps[d].file_location)
-        entries[d] = "%s@%s" % (url, rev)
+        entries[d] = GetURLAndRev(d, deps[d].file_location)
 
     # 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
             ).ParseDepsFile(False)
         url = deps[d].GetUrl(d, sub_deps_base_url, self.root_dir(), sub_deps)
-        (url, rev) = GetURLAndRev(d, url)
-        entries[d] = "%s@%s" % (url, rev)
+        entries[d] = GetURLAndRev(d, url)
 
     # Build the snapshot configuration string
     if self._options.snapshot:
+      url = entries.pop(name)
+
+    # Build the snapshot configuration string
+    if self._options.snapshot:
       url = entries.pop(name)
       custom_deps = ''.join(['      \"%s\": \"%s\",\n' % (x, entries[x])
                              for x in sorted(entries.keys())])
 
       new_gclient += self.DEFAULT_SNAPSHOT_SOLUTION_TEXT % {
                      'solution_name': name,
                      'solution_url': url,
                      'safesync_url' : '',
                      'solution_deps': custom_deps,
                      }
@@ skipping 419 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: