[NaCl SDK] Never check SVN or git-svn for Chromium repo.

native_client_sdk/src/build_tools/build_version.py

 # Copyright (c) 2012 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.
 
 """Small utility library of python functions used during SDK building.
 """
 
 import os
 import re
 import sys
@@ skipping 10 matching lines @@
 # Location of chrome's version file.
 VERSION_PATH = os.path.join(SRC_DIR, 'chrome', 'VERSION')
 
 
 def ChromeVersion():
   '''Extract chrome version from src/chrome/VERSION + svn.
 
   Returns:
     Chrome version string or trunk + svn rev.
   '''
-  info = FetchVersionInfo()
+  info = FetchGitCommitPosition()
   if info.url == 'git':
     _, ref, revision = ParseCommitPosition(info.revision)
     if ref == 'refs/heads/master':
       return 'trunk.%s' % revision
   return ChromeVersionNoTrunk()
 
 
 def ChromeVersionNoTrunk():
   '''Extract the chrome version from src/chrome/VERSION.
   Ignore whether this is a trunk build.
@@ skipping 39 matching lines @@
   return FetchGitCommitPosition().revision
 
 
 def NaClRevision():
   '''Extract NaCl revision from svn.
 
   Returns:
     The NaCl revision as a string. e.g. "12345"
   '''
   nacl_dir = os.path.join(SRC_DIR, 'native_client')
-  return FetchVersionInfo(nacl_dir, 'native_client').revision
-
-
-def FetchVersionInfo(directory=None,
-                     directory_regex_prior_to_src_url='chrome|blink|svn'):
-  '''Returns the last change (in the form of a branch, revision tuple),
-  from some appropriate revision control system.
-
-  TODO(binji): This is copied from lastchange.py. Remove this function and use
-  lastchange.py directly when the dust settles. (see crbug.com/406783)
-  '''
-  svn_url_regex = re.compile(
-      r'.*/(' + directory_regex_prior_to_src_url + r')(/.*)')
-
-  version_info = (lastchange.FetchSVNRevision(directory, svn_url_regex) or
-                  lastchange.FetchGitSVNRevision(directory, svn_url_regex) or
-                  FetchGitCommitPosition(directory))
-  if not version_info:
-    version_info = lastchange.VersionInfo(None, None)
-  return version_info
+  return lastchange.FetchVersionInfo(None, nacl_dir, 'native_client').revision
 
 
 def FetchGitCommitPosition(directory=None):
   '''Return the "commit-position" of the Chromium git repo. This should be
   equivalent to the SVN revision if one exists.
   '''
   SEARCH_LIMIT = 100
   for i in xrange(SEARCH_LIMIT):
     cmd = ['show', '-s', '--format=%H%n%B', 'HEAD~%d' % i]
     proc = lastchange.RunGitCommand(directory, cmd)
@@ skipping 25 matching lines @@
 
   Given a commit position like:
     0178d4831bd36b5fb9ff477f03dc43b11626a6dc-refs/heads/master@{#292238}
   Returns:
     ("0178d4831bd36b5fb9ff477f03dc43b11626a6dc", "refs/heads/master", "292238")
   '''
   m = re.match(r'([0-9a-fA-F]+)(?:-([^@]+)@{#(\d+)})?', commit_position)
   if m:
     return m.groups()
   return None