A small refactor I had lying around for a while.

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 729 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()
     return 0
 
   def PrintRevInfo(self):
-    """Output revision info mapping for the client and its dependencies.
-
-    This allows the capture of an overall "revision" for the source tree that
-    can be used to reproduce the same tree in the future. It is only useful for
-    "unpinned dependencies", i.e. DEPS/deps references without a svn revision
-    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')
     # Load all the settings.
     self.RunCommandRecursively(self._options, {}, None, [], None)
 
-    def GetURLAndRev(name, original_url):
-      """Returns the revision-qualified SCM url."""
-      if original_url is None:
+    def GetURLAndRev(dep):
+      """Returns the revision-qualified SCM url for a Dependency."""
+      if dep.parsed_url is None:
         return None
-      if isinstance(original_url, self.FileImpl):
-        original_url = original_url.file_location
+      if isinstance(dep.parsed_url, self.FileImpl):
+        original_url = dep.parsed_url.file_location
+      else:
+        original_url = dep.parsed_url
       url, _ = gclient_utils.SplitUrlRevision(original_url)
-      scm = gclient_scm.CreateSCM(original_url, self.root_dir(), name)
+      scm = gclient_scm.CreateSCM(original_url, self.root_dir(), dep.name)
       if not os.path.isdir(scm.checkout_path):
         return None
       return '%s@%s' % (url, scm.revinfo(self._options, [], None))
 
     if self._options.snapshot:
       new_gclient = ''
       # First level at .gclient
       for d in self.dependencies:
         entries = {}
-        def GrabDeps(sol):
+        def GrabDeps(dep):
           """Recursively grab dependencies."""
-          for i in sol.dependencies:
-            entries[i.name] = GetURLAndRev(i.name, i.parsed_url)
-            GrabDeps(i)
+          for d in dep.dependencies:
+            entries[d.name] = GetURLAndRev(d)
+            GrabDeps(d)
         GrabDeps(d)
         custom_deps = []
         for k in sorted(entries.keys()):
           if entries[k]:
             # Quotes aren't escaped...
             custom_deps.append('      \"%s\": \'%s\',\n' % (k, entries[k]))
           else:
             custom_deps.append('      \"%s\": None,\n' % k)
         new_gclient += self.DEFAULT_SNAPSHOT_SOLUTION_TEXT % {
             'solution_name': d.name,
             'solution_url': d.url,
             'safesync_url' : d.safesync_url or '',
             'solution_deps': ''.join(custom_deps),
         }
       # Print the snapshot configuration file
       print(self.DEFAULT_SNAPSHOT_FILE_TEXT % {'solution_list': new_gclient})
     else:
       entries = sorted(self.tree(False), key=lambda i: i.name)
-      for entry in entries:
-        entry_url = GetURLAndRev(entry.name, entry.parsed_url)
-        line = '%s: %s' % (entry.name, entry_url)
-        if not entry is entries[-1]:
+      for d in entries:
+        entry_url = GetURLAndRev(d)
+        line = '%s: %s' % (d.name, entry_url)
+        if not d is entries[-1]:
           line += ';'
         print line
     logging.info(str(self))
 
   def ParseDepsFile(self, direct_reference):
     """No DEPS to parse for a .gclient file."""
     self.direct_reference = True
     self.deps_parsed = True
 
   def root_dir(self):
@@ skipping 392 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: