From: agiersch <agiersch@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Wed, 1 Dec 2010 22:01:16 +0000 (+0000)
Subject: Check if we are on a git-svn repository before running git svn info.
X-Git-Tag: v3.6_beta2~1057
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/662ca0d7dad6e008d07873093ff5a71d49db2a64

Check if we are on a git-svn repository before running git svn info.

Otherwise, git svn info is painfully slow to report failure.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@8855 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake
index 6f04bc5eaa..ce27f9a742 100644
--- a/buildtools/Cmake/CompleteInFiles.cmake
+++ b/buildtools/Cmake/CompleteInFiles.cmake
@@ -377,20 +377,28 @@ if(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 
 	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log --oneline -1" OUTPUT_VARIABLE "GIT_VERSION")
 	exec_program("git --git-dir=${PROJECT_DIRECTORY}/.git log -n 1 --format=%ai ." OUTPUT_VARIABLE "GIT_DATE")
-	exec_program("git svn info" ${PROJECT_DIRECTORY} OUTPUT_VARIABLE "GIT_SVN_VERSION")
 	
 	string(REGEX REPLACE " .*" "" GIT_VERSION "${GIT_VERSION}")
-	string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
 	STRING(REPLACE " +0000" "" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE " " "~" GIT_DATE ${GIT_DATE})
 	STRING(REPLACE ":" "-" GIT_DATE ${GIT_DATE})
-	foreach(line ${GIT_SVN_VERSION})
-		string(REGEX MATCH "^Revision:.*" line_good ${line})
-		if(line_good)
-			string(REPLACE "Revision: " "" line_good ${line_good})
-			set(SVN_VERSION ${line_good})
-		endif(line_good)
-	endforeach(line ${GIT_SVN_VERSION})
+
+	exec_program("git config --get svn-remote.svn.url"
+		OUTPUT_VARIABLE url
+		RETURN_VALUE ret)
+	if(ret EQUAL 0)
+		exec_program("git svn info" ${PROJECT_DIRECTORY}
+			OUTPUT_VARIABLE "GIT_SVN_VERSION")
+		string(REPLACE "\n" ";" GIT_SVN_VERSION ${GIT_SVN_VERSION})
+		foreach(line ${GIT_SVN_VERSION})
+			string(REGEX MATCH "^Revision:.*" line_good ${line})
+			if(line_good)
+				string(REPLACE "Revision: " ""
+					line_good ${line_good})
+				set(SVN_VERSION ${line_good})
+			endif(line_good)
+		endforeach(line ${GIT_SVN_VERSION})
+	endif(ret EQUAL 0)
 endif(IS_DIRECTORY ${PROJECT_DIRECTORY}/.git)
 
 ###################################