[Cmake-commits] [cmake-commits] king committed CTest.cmake 1.17 1.18

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv10297/Modules

Modified Files:
	CTest.cmake 
Log Message:
ENH: Teach CTest to handle Mercurial repositories

This creates cmCTestHG to drive CTest Update handling on hg-based work
trees.  Currently we always update to the head of the remote tracking
branch (hg pull), so the nightly start time is ignored for Nightly
builds.  A later change will address this.

See issue #7879.  Patch from Emmanuel Christophe.  I modified the patch
slightly for code style, to finish up some parsing details, and to fix
the test.


Index: CTest.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CTest.cmake,v
retrieving revision 1.17
retrieving revision 1.18
diff -C 2 -d -r1.17 -r1.18
*** CTest.cmake	15 May 2009 19:39:43 -0000	1.17
--- CTest.cmake	10 Jul 2009 15:07:41 -0000	1.18
***************
*** 81,84 ****
--- 81,85 ----
    FIND_PROGRAM(SVNCOMMAND svn)
    FIND_PROGRAM(BZRCOMMAND bzr)
+   FIND_PROGRAM(HGCOMMAND hg)
  
    IF(NOT UPDATE_TYPE)
***************
*** 91,94 ****
--- 92,99 ----
          IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
            SET(UPDATE_TYPE bzr)
+         ELSE(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
+           IF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg")
+             SET(UPDATE_TYPE hg)
+           ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.hg")
          ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.bzr")
        ENDIF(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.svn")
***************
*** 115,118 ****
--- 120,128 ----
          SET(UPDATE_COMMAND "${BZRCOMMAND}")
          SET(UPDATE_OPTIONS "${BZR_UPDATE_OPTIONS}")
+       ELSE("${_update_type}" STREQUAL "bzr")
+         IF("${_update_type}" STREQUAL "hg")
+           SET(UPDATE_COMMAND "${HGCOMMAND}")
+           SET(UPDATE_OPTIONS "${HG_UPDATE_OPTIONS}")
+         ENDIF("${_update_type}" STREQUAL "hg")
        ENDIF("${_update_type}" STREQUAL "bzr")
      ENDIF("${_update_type}" STREQUAL "svn")
***************
*** 194,197 ****
--- 204,208 ----
      SVNCOMMAND
      BZRCOMMAND
+     HGCOMMAND
      CVS_UPDATE_OPTIONS
      SVN_UPDATE_OPTIONS