[Cmake-commits] CMake branch, next, updated. v2.8.7-3334-g43624f8

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  43624f87b749a9c8eaeada6a1bb537f0622029f4 (commit)
       via  d0702f8214f261d72c66ac7e400d9af984cd9391 (commit)
      from  388a5b23963fb0a7474d12e63a3a1cd4b0b3e6f7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=43624f87b749a9c8eaeada6a1bb537f0622029f4
commit 43624f87b749a9c8eaeada6a1bb537f0622029f4
Merge: 388a5b2 d0702f8
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 22 12:01:09 2012 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Mar 22 12:01:09 2012 -0400

    Merge topic 'fix-CTestUpdateHG-url' into next
    
    d0702f8 CTest.UpdateHG: Fix repo URL for leading slash


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d0702f8214f261d72c66ac7e400d9af984cd9391
commit d0702f8214f261d72c66ac7e400d9af984cd9391
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Thu Mar 22 11:56:41 2012 -0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Thu Mar 22 11:57:38 2012 -0400

    CTest.UpdateHG: Fix repo URL for leading slash
    
    Use "file:///..." instead of "file:////..." when the file system path
    starts in a slash.  Commit 0916cc88 (CTest.UpdateHG: Fix repo URL for
    local filesystem, 2012-03-02) added a third slash after "file://"
    unconditionally.  This worked for many file systems but not on Cygwin
    where "file:////cygdrive/..." looks like "file://" followed by a network
    file path "//cygdrive/...".  Add the slash only if the file system path
    does not already start with one.

diff --git a/Tests/CTestUpdateHG.cmake.in b/Tests/CTestUpdateHG.cmake.in
index 5a9daae..640d2c6 100644
--- a/Tests/CTestUpdateHG.cmake.in
+++ b/Tests/CTestUpdateHG.cmake.in
@@ -28,7 +28,10 @@ run_child(
   WORKING_DIRECTORY ${TOP}/repo.hg
   COMMAND ${HG} init
   )
-set(REPO file:///${TOP}/repo.hg)
+if(NOT "${TOP}" MATCHES "^/")
+  set(slash /)
+endif()
+set(REPO file://${slash}${TOP}/repo.hg)
 
 #-----------------------------------------------------------------------------
 # Import initial content into the repository.

-----------------------------------------------------------------------

Summary of changes:
 Tests/CTestUpdateHG.cmake.in |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
CMake