[llvm] 0384446 - Remove SVN logic from find_first_existing_vc_file
Sameer Sahasrabuddhe via llvm-commits
llvm-commits at lists.llvm.org
Fri May 29 08:02:58 PDT 2020
Author: Pushpinder Singh
Date: 2020-05-29T20:31:55+05:30
New Revision: 0384446c7c2458b12ce3ef1c2bdf438af1f78ad7
URL: https://github.com/llvm/llvm-project/commit/0384446c7c2458b12ce3ef1c2bdf438af1f78ad7
DIFF: https://github.com/llvm/llvm-project/commit/0384446c7c2458b12ce3ef1c2bdf438af1f78ad7.diff
LOG: Remove SVN logic from find_first_existing_vc_file
As LLVM has moved from SVN to git, there is no need to
keep SVN related code. Also, this code piece was never used.
Differential Revision: https://reviews.llvm.org/D79400
Added:
Modified:
llvm/cmake/modules/AddLLVM.cmake
Removed:
################################################################################
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
index f16f63c32c95..f4dbd364262b 100644
--- a/llvm/cmake/modules/AddLLVM.cmake
+++ b/llvm/cmake/modules/AddLLVM.cmake
@@ -2094,40 +2094,27 @@ function(find_first_existing_vc_file path out_var)
if(NOT EXISTS "${path}")
return()
endif()
- if(EXISTS "${path}/.svn")
- set(svn_files
- "${path}/.svn/wc.db" # SVN 1.7
- "${path}/.svn/entries" # SVN 1.6
- )
- foreach(file IN LISTS svn_files)
- if(EXISTS "${file}")
- set(${out_var} "${file}" PARENT_SCOPE)
- return()
- endif()
- endforeach()
- else()
- find_package(Git)
- if(GIT_FOUND)
- execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
- WORKING_DIRECTORY ${path}
- RESULT_VARIABLE git_result
- OUTPUT_VARIABLE git_output
- ERROR_QUIET)
- if(git_result EQUAL 0)
- string(STRIP "${git_output}" git_output)
- get_filename_component(git_dir ${git_output} ABSOLUTE BASE_DIR ${path})
- # Some branchless cases (e.g. 'repo') may not yet have .git/logs/HEAD
- if (NOT EXISTS "${git_dir}/logs/HEAD")
- execute_process(COMMAND ${CMAKE_COMMAND} -E touch HEAD
- WORKING_DIRECTORY "${git_dir}/logs"
- RESULT_VARIABLE touch_head_result
- ERROR_QUIET)
- if (NOT touch_head_result EQUAL 0)
- return()
- endif()
+ find_package(Git)
+ if(GIT_FOUND)
+ execute_process(COMMAND ${GIT_EXECUTABLE} rev-parse --git-dir
+ WORKING_DIRECTORY ${path}
+ RESULT_VARIABLE git_result
+ OUTPUT_VARIABLE git_output
+ ERROR_QUIET)
+ if(git_result EQUAL 0)
+ string(STRIP "${git_output}" git_output)
+ get_filename_component(git_dir ${git_output} ABSOLUTE BASE_DIR ${path})
+ # Some branchless cases (e.g. 'repo') may not yet have .git/logs/HEAD
+ if (NOT EXISTS "${git_dir}/logs/HEAD")
+ execute_process(COMMAND ${CMAKE_COMMAND} -E touch HEAD
+ WORKING_DIRECTORY "${git_dir}/logs"
+ RESULT_VARIABLE touch_head_result
+ ERROR_QUIET)
+ if (NOT touch_head_result EQUAL 0)
+ return()
endif()
- set(${out_var} "${git_dir}/logs/HEAD" PARENT_SCOPE)
endif()
+ set(${out_var} "${git_dir}/logs/HEAD" PARENT_SCOPE)
endif()
endif()
endfunction()
More information about the llvm-commits
mailing list