Update nacl SDK code to match recent changes to lastchange.py

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 = FetchGitCommitPosition()
-  if info.url == 'git':
-    _, ref, revision = ParseCommitPosition(info.revision)
-    if ref == 'refs/heads/master':
-      return 'trunk.%s' % revision
+  info = FetchCommitPosition()
+  _, 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.
 
   Returns:
     Chrome version string.
   '''
@@ skipping 14 matching lines @@
 def ChromeRevision():
   '''Extract chrome revision from svn.
 
      Now that the Chrome source-of-truth is git, this will return the
      Cr-Commit-Position instead. Fortunately, this value is equal to the SVN
      revision if one exists.
 
   Returns:
     The Chrome revision as a string. e.g. "12345"
   '''
-  version = FetchGitCommitPosition()
+  version = FetchCommitPosition()
   return ParseCommitPosition(version.revision)[2]
 
 
 def ChromeCommitPosition():
   '''Return the full git sha and commit position.
 
   Returns:
     A value like:
     0178d4831bd36b5fb9ff477f03dc43b11626a6dc-refs/heads/master@{#292238}
   '''
-  return FetchGitCommitPosition().revision
+  return FetchCommitPosition().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 lastchange.FetchVersionInfo(None, nacl_dir, 'native_client').revision
+  return lastchange.FetchVersionInfo(nacl_dir).revision
 
 
-def FetchGitCommitPosition(directory=None):
+def FetchCommitPosition(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)
     if not proc:
       break
 
     output = proc.communicate()[0]
     if not (proc.returncode == 0 and output):
       break
 
     lines = output.splitlines()
 
     # First line is the hash.
     hsh = lines[0]
     if not re.match(r'[0-9a-fA-F]+', hsh):
       break
 
     for line in reversed(lines):
       if line.startswith('Cr-Commit-Position:'):
         pos = line.rsplit()[-1].strip()
-        return lastchange.VersionInfo('git', '%s-%s' % (hsh, pos))
+        return lastchange.VersionInfo('%s-%s' % (hsh, pos))
 
   raise Exception('Unable to fetch a Git Commit Position.')
 
 
 
 def ParseCommitPosition(commit_position):
   '''Parse a Chrome commit position into its components.
 
   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