Unify the version string to be displayed on "About Chromium" dialog.

chrome/tools/build/mac/tweak_info_plist

Index: chrome/tools/build/mac/tweak_info_plist
diff --git a/chrome/tools/build/mac/tweak_info_plist b/chrome/tools/build/mac/tweak_info_plist
index e856547f8aa21728d73e20555fbb7b8d56f8f721..5d198b76fb3a4bdfcfdfc7ec36bff131ab8e37ef 100755
--- a/chrome/tools/build/mac/tweak_info_plist
+++ b/chrome/tools/build/mac/tweak_info_plist
@@ -31,6 +31,9 @@ import tempfile
 
 TOP = os.path.join(env['SRCROOT'], '..')
 
+sys.path.insert(0, os.path.join(TOP, "build/util/"))

[Mark Mentovai, 2011/06/30 13:34:23]

No trailing slash.

[haraken1, 2011/07/04 07:50:52]

Done.

+import lastchange
+
 
 def _GetOutput(args):
   """Runs a subprocess and waits for termination. Returns (stdout, returncode)
@@ -98,63 +101,13 @@ def _AddVersionKeys(plist):
   return True
 
 
-def _GetSCMInfo():
-  """Returns a 2-Tuple of (scm_path, scm_revision) for the SVN information."""
-  # Attempt to get both the SVN revision number and the branch (or trunk).
-  scm_revision = None
-  scm_path = None
-
-  # First attempt to get the SVN revision number and path.
-  (stdout, retval) = _GetOutputNoError(['svn', 'info', TOP])
-  if not retval:
-    match = re.search('^Revision: ([0-9]+)$', stdout, re.MULTILINE)
-    if match:
-      scm_revision = match.group(1)
-
-    match = re.search('^Repository Root: (.+)$', stdout, re.MULTILINE)
-    if match:
-      svn_repo_root = match.group(1)
-
-    match = re.search('^URL: (.+)$', stdout, re.MULTILINE)
-    if match:
-      svn_url = match.group(1)
-
-    # If there's both a repo root and a URL, find the branch path.
-    if svn_repo_root and svn_url and svn_url.startswith(svn_repo_root):
-      # Grab the path to the source root in the Subversion repository by taking
-      # the URL to the source root directory and the repository root, and
-      # removing the latter from the former.  This ensures that scm_path will
-      # contain a useful path regardless of the Subversion server, mirror, and
-      # authentication scheme in use.
-      scm_path = svn_url[len(svn_repo_root):]
-
-  # If the desired information was found via SVN, return it now.
-  if scm_revision != None and scm_path != None:
-    return (scm_path, scm_revision)
-
-  # If a SVN revision number couldn't be found, try getting it through git.
-  (stdout, retval) = _GetOutputNoError(['git', 'log', '-1',
-                                        '--grep=git-svn-id', '--format=%b'])
-  # Extract both the last changed SVN revision and the branch path (see block
-  # comment above).
-  # git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85528 0039d316-1c4b...
-  if not retval:
-    match = re.search(r'git-svn-id: .*/(chrome|svn)(/.*)@([0-9]+)', stdout,
-                      re.MULTILINE)
-    if match:
-      scm_path = match.group(2)
-      scm_revision = match.group(3)
-
-  # Finally, return the results (which could be None on error).
-  return (scm_path, scm_revision)
-
-
 def _DoSVNKeys(plist, add_keys):
   """Adds the SVN information, visible in about:version, to property list. If
   |add_keys| is True, it will insert the keys, otherwise it will remove them."""
-  (scm_path, scm_revision) = None, None
+  scm_path, scm_revision = None, None
   if add_keys:
-    (scm_path, scm_revision) = _GetSCMInfo()
+    version_info = lastchange.FetchVersionInfo(default_lastchange=None)

[Mark Mentovai, 2011/06/30 13:34:23]

If FetchVersionInfo fails, version_info will still be set to a 3-tuple
containing values, but these values are not the same as those that the code
below treats as “couldn’t find the data.”

[haraken1, 2011/07/04 07:50:52]

Done.

+    scm_path, scm_revision = version_info.url, version_info.revision

[Mark Mentovai, 2011/06/30 13:34:23]

The value of scm_path will be wrong. The existing code (red, above) took care to
strip the “repository root” portion off of the “URL” portion for Subversion, and
to take only the portion after /chrome/ or /svn/ from a git-svn-id.

It doesn’t appear that lastchange.py takes this into account at all. It should.

It’s important to get this right, or you will leak internal Subversion or git
addresses.

In case it helps, when this script runs ont he Mac, we expect the relevant
portion of Info.plist to wind up looking like this:

        <key>SVNPath</key>
        <string>/trunk/src</string>
        <key>SVNRevision</key>
        <string>90926</string>

[haraken1, 2011/07/04 07:50:52]

Done. In addition, I modified the rule to extract the URL from Subversion so
that it extracts the portion after /chrome/ or /svn/. 

 
   # See if the operation failed.
   _RemoveKeys(plist, 'SVNRevision')