Remove GetSVNRevision from tools/utils.py

tools/utils.py

 # Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
 import datetime
 import json
@@ skipping 276 matching lines @@
   return ('%s.%s.%s.%s.%s' % (
       version.major, version.minor, version.patch, version.prerelease,
       version.prerelease_patch))
 
 def GetSemanticSDKVersion(ignore_svn_revision=False):
   version = ReadVersionFile()
   if not version:
     return None
 
   if version.channel == 'be':
-    postfix = '-edge' if ignore_svn_revision else '-edge.%s' % GetSVNRevision()
+    postfix = '-edge' if ignore_svn_revision else '-edge.%s' % GetGitRevision()
   elif version.channel == 'dev':
     postfix = '-dev.%s.%s' % (version.prerelease, version.prerelease_patch)
   else:
     assert version.channel == 'stable'
     postfix = ''
 
   return '%s.%s.%s%s' % (version.major, version.minor, version.patch, postfix)
 
-def GetEclipseVersionQualifier():
-  def pad(number, num_digits):
-    number_str = str(number)
-    return '0' * max(0, num_digits - len(number_str)) + number_str
-
-  version = ReadVersionFile()
-  if version.channel == 'be':
-    return 'edge_%s' % pad(GetSVNRevision(), 6)
-  elif version.channel == 'dev':
-    return 'dev_%s_%s' % (pad(version.prerelease, 2),
-                          pad(version.prerelease_patch, 2))
-  else:
-    return 'release'
-
 def GetVersion():
   return GetSemanticSDKVersion()
 
-
 # The editor used to produce the VERSION file put on gcs. We now produce this
 # in the bots archiving the sdk.
 # The content looks like this:
 #{
 #  "date": "2015-05-28",
 #  "version": "1.11.0-edge.131653",
 #  "revision": "535394c2657ede445142d8a92486d3899bbf49b5"
 #}
 def GetVersionFileContent():
   result = {"date": str(datetime.date.today()),
@@ skipping 34 matching lines @@
   prerelease = match_against('^PRERELEASE (\d+)$', content)
   prerelease_patch = match_against('^PRERELEASE_PATCH (\d+)$', content)
 
   if channel and major and minor and prerelease and prerelease_patch:
     return Version(
         channel, major, minor, patch, prerelease, prerelease_patch)
   else:
     print "Warning: VERSION file (%s) has wrong format" % version_file
     return None
 
-def GetSVNRevision():
-  # When building from tarball use tools/SVN_REVISION
-  svn_revision_file = os.path.join(DART_DIR, 'tools', 'SVN_REVISION')
-  try:
-    with open(svn_revision_file) as fd:
-      return fd.read()
-  except:
-    pass
-
-  # TODO(ricow): Remove all calls to GetSVNRevision.
-  # For now, simply forward call to GetArchiveVersion
-  return GetArchiveVersion();
 
 # Our schema for releases and archiving is based on an increasing
 # sequence of numbers. In the svn world this was simply the revision of a
 # commit, which would always give us a one to one mapping between the number
 # and the commit. This was true across branches as well, so a number used
 # to archive a build was always unique and unambiguous.
 # In git there is no such global number, so we loosen the requirement a bit.
 # We only use numbers on the master branch (bleeding edge). On branches
 # we use the version number instead for archiving purposes.
 # The number on master is the count of commits on the master branch.
 def GetArchiveVersion():
   version = ReadVersionFile()
   if not version:
     raise 'Could not get the archive version, parsing the version file failed'
   if version.channel == 'be':
     return GetGitNumber()
   return GetSemanticSDKVersion()
 
 
 def GetGitRevision():
+  # When building from tarball use tools/GIT_REVISION
+  git_revision_file = os.path.join(DART_DIR, 'tools', 'GIT_REVISION')
+  try:
+    with open(git_revision_file) as fd:
+      return fd.read()
+  except:
+    pass
+
   p = subprocess.Popen(['git', 'log', '-n', '1', '--pretty=format:%H'],
                        stdout = subprocess.PIPE,
                        stderr = subprocess.STDOUT, shell=IsWindows(),
                        cwd = DART_DIR)
   output, _ = p.communicate()
   # We expect a full git hash
   if len(output) != 40:
     print "Warning: could not parse git commit, output was %s" % output
     return None
   return output
 
-# To eliminate clashing with older archived builds on bleding edge we add
+# To eliminate clashing with older archived builds on bleeding edge we add
 # a base number bigger the largest svn revision (this also gives us an easy
 # way of seeing if an archive comes from git based or svn based commits).
 GIT_NUMBER_BASE = 100000
 def GetGitNumber():
   p = subprocess.Popen(['git', 'rev-list', 'HEAD', '--count'],
                        stdout = subprocess.PIPE,
                        stderr = subprocess.STDOUT, shell=IsWindows(),
                        cwd = DART_DIR)
   output, _ = p.communicate()
   try:
@@ skipping 200 matching lines @@
     os.chdir(self._working_directory)
 
   def __exit__(self, *_):
     print "Enter directory = ", self._old_cwd
     os.chdir(self._old_cwd)
 
 
 if __name__ == "__main__":
   import sys
   Main()