Fix version script for git repos that are not git-svn.

runtime/tools/make_version.py

 # Copyright (c) 2011, 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 python script creates a version string in a C++ file.
 
 import os
 import sys
 import subprocess
 import platform
@@ skipping 17 matching lines @@
   debugLog("Got result: %s" % result)
   return result
 
 def getRevision():
   debugLog("Getting revision")
   is_svn = True
   if os.path.exists('.svn'):
     debugLog("Using svn to get revision")
     cmd = ['svn', 'info']
   else:
-    debugLog("Using git svn to get revision")
-    cmd = ['git', 'svn', 'info']
-  try:
-    debugLog("Running command to get revision: %s" % cmd)
-    proc = subprocess.Popen(cmd,
-                            stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
-    revision = proc.communicate()[0].split('\n')[4].split(' ')[1]
-    debugLog("Got revision: %s" % revision)
-    return revision
-  except Exception:
-    # If we can't get any revision info (due to lack of tooling) return ''.
-    return ''
-
+    git_proc = subprocess.Popen(

[Ivan Posva, 2012/10/26 02:57:06]

I know this was already an issue previously: What if this is not a git checkout
either? But now you just get an exception thrown out of this function. Not good.

[Mads Ager (google), 2012/10/26 06:26:47]

Yeah, I actually did remove a try: block from here. I should put it back. Wrap
this entire else: in a try: block and catch the exceptions. Thanks.

+        ['git', 'branch', '-r'],
+        stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+    if 'git-svn' in git_proc.communicate()[0]:
+      debugLog("Using git svn to get revision")
+      cmd = ['git', 'svn', 'info']
+    else:
+      # Cannot get revision because we are not in svn or
+      # git svn checkout.
+      debugLog("Could not get revision: not an svn or git-svn checkout?")
+      return ''
+  debugLog("Running command to get revision: %s" % cmd)
+  proc = subprocess.Popen(cmd,
+                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
+  revision = proc.communicate()[0].split('\n')[4].split(' ')[1]
+  debugLog("Got revision: %s" % revision)
+  return revision
 
 def makeVersionString(version_file):
   id = platform.system()
   if id == 'Windows' or id == 'Microsoft':
     return '0.0.0.0'
   major = getVersionPart(version_file, 'MAJOR')
   minor = getVersionPart(version_file, 'MINOR')
   build = getVersionPart(version_file, 'BUILD')
   patch = getVersionPart(version_file, 'PATCH')
   revision = getRevision()
@@ skipping 58 matching lines @@
     sys.stderr.write('make_version.py exception\n')
     sys.stderr.write(str(inst))
     sys.stderr.write('\n')
     return -1
 
 if __name__ == '__main__':
   debugLog('starting make_version.py')
   exit_code = main(sys.argv)
   debugLog('exiting make_version.py (exit code: %s)' % exit_code)
   sys.exit(exit_code)