[PATCH] D30092: CMake: Clean up VersionFromVCS.cmake

[Tom Stellard via Phabricator via llvm-commits]

tstellar created this revision.
Herald added a subscriber: mgorny.

Fix a few problems in VersionFromVCS.cmake to make it more reliable:

- Stop using git svn info to retrieve the svn revision.  I am unable to determine what the svn revision returned by this command means. During my testing this command returned a revision from a month ago which was not the HEAD of any of my local branches.

  Also, this revision was never actually added to the version string due to a typo in the script.  All it was used for was to reject the revision number returned by git svn find-rev HEAD when the revision numbers didn't match.

- Populate LLVM_REPOSITORY variable using git svn info --url.  This lets avoid having to do a search and replace on the output of git svn info

- Populate GIT_COMMIT even when we detect a git repo without any svn information.


https://reviews.llvm.org/D30092

Files:
  cmake/modules/VersionFromVCS.cmake


Index: cmake/modules/VersionFromVCS.cmake
===================================================================
--- cmake/modules/VersionFromVCS.cmake
+++ cmake/modules/VersionFromVCS.cmake
@@ -28,57 +28,51 @@
   elseif( EXISTS ${SOURCE_DIR}/.git )
     set(result "${result}git")
     # Try to get a ref-id
-    if( EXISTS ${SOURCE_DIR}/.git/svn )
-      find_program(git_executable NAMES git git.exe git.cmd)
-      if( git_executable )
-        set(is_git_svn_rev_exact false)
+    find_program(git_executable NAMES git git.exe git.cmd)
+
+    if( git_executable )
+      if( EXISTS ${SOURCE_DIR}/.git/svn )
+        # Get the repository URL
         execute_process(COMMAND
-          ${git_executable} svn info
+          ${git_executable} svn info --url
           WORKING_DIRECTORY ${SOURCE_DIR}
           TIMEOUT 5
           RESULT_VARIABLE git_result
           OUTPUT_VARIABLE git_output)
         if( git_result EQUAL 0 )
-          string(REGEX MATCH "URL: ([^ \n]*)" svn_url ${git_output})
-          if(svn_url)
-            set(LLVM_REPOSITORY ${CMAKE_MATCH_1} PARENT_SCOPE)
-          endif()
-
-          string(REGEX REPLACE "^(.*\n)?Revision: ([^\n]+).*"
-            "\\2" git_svn_rev_number "${git_output}")
-          set(SVN_REVISION ${git_svn_rev_number} PARENT_SCOPE)
-          set(git_svn_rev "-svn-${git_svn_rev}")
-
-          # Determine if the HEAD points directly at a subversion revision.
-          execute_process(COMMAND ${git_executable} svn find-rev HEAD
-            WORKING_DIRECTORY ${SOURCE_DIR}
-            TIMEOUT 5
-            RESULT_VARIABLE git_result
-            OUTPUT_VARIABLE git_output)
-          if( git_result EQUAL 0 )
-            string(STRIP "${git_output}" git_head_svn_rev_number)
-            if( git_head_svn_rev_number EQUAL git_svn_rev_number )
-              set(is_git_svn_rev_exact true)
-            endif()
-          endif()
-        else()
-          set(git_svn_rev "")
+          string(STRIP "${git_output}" svn_url)
+          set(LLVM_REPOSITORY ${svn_url} PARENT_SCOPE)
         endif()
-        execute_process(COMMAND
-          ${git_executable} rev-parse --short HEAD
+
+        # Get the svn revision number for this git commit if one exists.
+        execute_process(COMMAND ${git_executable} svn find-rev HEAD
           WORKING_DIRECTORY ${SOURCE_DIR}
           TIMEOUT 5
           RESULT_VARIABLE git_result
           OUTPUT_VARIABLE git_output)
-
-        if( git_result EQUAL 0 AND NOT is_git_svn_rev_exact )
-          string(STRIP "${git_output}" git_ref_id)
-          set(GIT_COMMIT ${git_ref_id} PARENT_SCOPE)
-          set(result "${result}${git_svn_rev}-${git_ref_id}")
+        if( git_result EQUAL 0 AND git_output)
+          string(STRIP "${git_output}" git_head_svn_rev_number)
+          set(SVN_REVISION ${git_head_svn_rev_number} PARENT_SCOPE)
+          set(git_svn_rev "-svn-${git_head_svn_rev_number}")
         else()
-          set(result "${result}${git_svn_rev}")
+          set(git_svn_rev "")
         endif()
+      endif()
+
+      # Get the git ref id
+      execute_process(COMMAND
+        ${git_executable} rev-parse --short HEAD
+        WORKING_DIRECTORY ${SOURCE_DIR}
+        TIMEOUT 5
+        RESULT_VARIABLE git_result
+        OUTPUT_VARIABLE git_output)
 
+      if( git_result EQUAL 0 )
+        string(STRIP "${git_output}" git_ref_id)
+        set(GIT_COMMIT ${git_ref_id} PARENT_SCOPE)
+        set(result "${result}${git_svn_rev}-${git_ref_id}")
+      else()
+        set(result "${result}${git_svn_rev}")
       endif()
     endif()
   endif()


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D30092.88880.patch
Type: text/x-patch
Size: 3586 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170217/b13670c3/attachment.bin>