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

build/util/lastchange.py

Index: build/util/lastchange.py
diff --git a/build/util/lastchange.py b/build/util/lastchange.py
index 4d7a1fe808d4a2707c0378ddef54d3f41a267144..2905f3773742ace9c136189d261f0d0e76af1879 100755
--- a/build/util/lastchange.py
+++ b/build/util/lastchange.py
@@ -102,117 +102,69 @@ def FetchGitRevision(directory):
   return None
 
 
-def IsGitSVN(directory):
+def MatchGitSVNRevision(output):
   """
-  Checks whether git-svn has been set up.
+  Extract the latest SVN revision and the SVN URL.
 
   Errors are swallowed.
-
-  Returns:
-    whether git-svn has been set up.
-  """
-  # To test whether git-svn has been set up, query the config for any
-  # svn-related configuration.  This command exits with an error code
-  # if there aren't any matches, so ignore its output.
-  proc = RunGitCommand(directory, ['config', '--get-regexp', '^svn'])
-  if proc:
-    return (proc.wait() == 0)
-  return False
-
-
-def FetchGitSVNURL(directory):
-  """
-  Fetch URL of SVN repository bound to git.
-
-  Errors are swallowed.
-
-  Returns:
-    SVN URL.
-  """
-  if IsGitSVN(directory):
-    proc = RunGitCommand(directory, ['svn', 'info', '--url'])
-    if proc:
-      output = proc.communicate()[0].strip()
-      if proc.returncode == 0:
-        match = re.search(r'^\w+://.*$', output, re.M)
-        if match:
-          return match.group(0)
-  return ''
-
-
-def FetchGitSVNRoot(directory):
   """
-  Fetch root of SVN repository bound to git.
-
-  Errors are swallowed.
+  # The target line is the last "git-svn-id: ..." line.
+  #
+  # git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85528 0039d316...
+  match = re.search(r'.*git-svn-id:\s*([^@]*)@([0-9]+)', output, re.DOTALL)
+  if match:
+    return (match.group(1), match.group(2))
+  return (None, None)
 
-  Returns:
-    SVN root repository.
-  """
-  if IsGitSVN(directory):
-    git_command = ['config', '--get-regexp', '^svn-remote.svn.url$']
-    proc = RunGitCommand(directory, git_command)
-    if proc:
-      output = proc.communicate()[0].strip()
-      if proc.returncode == 0:
-        # Zero return code implies presence of requested configuration variable.
-        # Its value is second (last) field of output.
-        match = re.search(r'\S+$', output)
-        if match:
-          return match.group(0)
-  return ''
-
-
-def LookupGitSVNRevision(directory, depth):
+def FetchGitSVNRevision(directory):
   """
-  Fetch the Git-SVN identifier for the local tree.
-  Parses first |depth| commit messages.
+  Fetch the SVN revision for a given directory through Git.
 
   Errors are swallowed.
   """
-  if not IsGitSVN(directory):
-    return None
-  git_re = re.compile(r'^\s*git-svn-id:\s+(\S+)@(\d+)')
-  proc = RunGitCommand(directory, ['log', '-' + str(depth)])
+  proc = RunGitCommand(directory, ['log', '-1',
+                                   '--grep=git-svn-id', '--format=%b'])
   if proc:

[tony, 2011/06/17 02:05:51]

Nit: Can we just early return if not proc to avoid the nesting?

-    for line in proc.stdout:
-      match = git_re.match(line)
-      if match:
-        id = match.group(2)
-        if id:
-          proc.stdout.close()  # Cut pipe for fast exit.
-          return id
+    output = proc.communicate()[0].strip()
+    if proc.returncode == 0 and output:
+      # Extract the latest SVN revision and the SVN URL.
+      url, revision = MatchGitSVNRevision(output)
+
+      if url and revision:
+        # Check if there are any local changes.
+        dirty = True

[tony, 2011/06/17 02:05:51]

Nit: Can we make the dirty check a function?

+        proc = RunGitCommand(directory, ['log', '-1'])
+        if proc:
+          output = proc.communicate()[0].strip()
+          if proc.returncode == 0 and output:
+            # Check if there are any local commits.
+            dummy_url, dummy_revision = MatchGitSVNRevision(output)
+
+            if dummy_url and dummy_revision:
+              # Check if there are any local uncommitted changes.
+              proc = RunGitCommand(directory, ['checkout'])
+              if proc:
+                output = proc.communicate()[0].strip()
+                if proc.returncode == 0 and not output:
+                  dirty = False
+
+        if dirty:
+          revision = revision + "-dirty"
+
+        # Extract the SVN root. This succeeds if git-svn is available.
+        root = 'git-svn'
+        proc = RunGitCommand(directory,
+                             ['config', '--get-regexp', '^svn-remote.svn.url$'])
+        if proc:
+          output = proc.communicate()[0].strip()
+          if proc.returncode == 0 and output:
+            match = re.search(r'\S+$', output)
+            if match:
+              root = match.group(0)

[tony, 2011/06/17 02:05:51]

Nit: Can we make this root extraction a function too?

+        return VersionInfo(url, root, revision)
   return None
 
 
-def IsGitSVNDirty(directory):
-  """
-  Checks whether our git-svn tree contains clean trunk or some branch.
-
-  Errors are swallowed.
-  """
-  # For git branches the last commit message is either
-  # some local commit or a merge.
-  return LookupGitSVNRevision(directory, 1) is None
-
-
-def FetchGitSVNRevision(directory):
-  """
-  Fetch the Git-SVN identifier for the local tree.
-
-  Errors are swallowed.
-  """
-  # We assume that at least first 999 commit messages contain svn evidence.
-  revision = LookupGitSVNRevision(directory, 999)
-  if not revision:
-    return None
-  if IsGitSVNDirty(directory):
-    revision = revision + '-dirty'
-  url = FetchGitSVNURL(directory)
-  root = FetchGitSVNRoot(directory)
-  return VersionInfo(url, root, revision)
-
-
 def FetchVersionInfo(default_lastchange, directory=None):
   """
   Returns the last change (in the form of a branch, revision tuple),