revinfo: Properly use git HEAD or svn BASE revisions

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 230 matching lines @@
     """Runs hooks for files that have been modified in the local working copy,
 according to 'svn status'. Implies --force.
 
 usage: runhooks [options]
 
 Valid options:
   --verbose           : output additional diagnostics
 """,
     "revinfo":
     """Outputs source path, server URL and revision information for every
-dependency in all solutions (no local checkout required).
+dependency in all solutions.
 
 usage: revinfo [options]
 """,
 }
 
 DEFAULT_CLIENT_FILE_TEXT = ("""\
 # An element of this array (a "solution") describes a repository directory
 # that will be checked out into your working copy.  Each solution may
 # optionally define additional dependencies (via its DEPS file) to be
 # checked out alongside the solution's directory.  A solution may also
@@ skipping 529 matching lines @@
                       entry_fixed)
           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 an overall "revision" for the source tree that can
-    be used to reproduce the same tree in the future. The actual output
+    """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. 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
+    that it can be used either to generate external svn/git commands (without
     gclient) or as input to gclient's --rev option (with some massaging of
     the data).
 
+    Since we care about the revision of the current source tree, for git
+    repositories this command uses the revision of the HEAD. For subversion we
+    use BASE.
+
+    The --snapshot option allows creating a .gclient file to reproduce the tree.
+
     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("@")
       # Disallow conflicting revs
       if revision_overrides.has_key(revision_elem[0]) and \
          revision_overrides[revision_elem[0]] != revision_elem[1]:
         raise gclient_utils.Error(
             "Conflicting revision numbers specified.")
       revision_overrides[revision_elem[0]] = revision_elem[1]
 
     solutions = self.GetVar("solutions")
     if not solutions:
       raise gclient_utils.Error("No solution specified")
 
-    # Inner helper to generate base url and rev tuple (including honoring
-    # |revision_overrides|)
+    # Inner helper to generate base url and rev tuple
     def GetURLAndRev(name, original_url):
-      url, revision = gclient_utils.SplitUrlRevision(original_url)
-      if not revision:
-        if revision_overrides.has_key(name):
-          return (url, revision_overrides[name])
-        else:
-          scm = gclient_scm.CreateSCM(solution["url"], self._root_dir, name)
-          return (url, scm.revinfo(self._options, [], None))
-      else:
-        if revision_overrides.has_key(name):
-          return (url, revision_overrides[name])
-        else:
-          return (url, revision)
+      url, _ = gclient_utils.SplitUrlRevision(original_url)
+      scm = gclient_scm.CreateSCM(original_url, self._root_dir, name)
+      return (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 = {}
     entries_deps_content = {}
     # Run on the base solutions first.
     for solution in solutions:
       # Dictionary of { path : SCM url } to describe the gclient checkout
@@ skipping 392 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: