[Cmake-commits] CMake branch, next, updated. v3.3.0-2139-gb8f0363

[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  b8f0363506ae5daa40f9635032dd3ba45c659cf6 (commit)
       via  6a77a77a62f6bfb66cea622621d6d1b68e775664 (commit)
      from  fbe703adf5f78d050c3317ad338add067a0889d6 (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=b8f0363506ae5daa40f9635032dd3ba45c659cf6
commit b8f0363506ae5daa40f9635032dd3ba45c659cf6
Merge: fbe703a 6a77a77
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Tue Aug 11 09:26:58 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Aug 11 09:26:58 2015 -0400

    Merge topic 'ExternalProject-hg-clone-without-update' into next
    
    6a77a77a ExternalProject: Tell "hg clone" not to implicitly update


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=6a77a77a62f6bfb66cea622621d6d1b68e775664
commit 6a77a77a62f6bfb66cea622621d6d1b68e775664
Author:     A. Joël Lamotte <mjklaim at gmail.com>
AuthorDate: Tue Aug 11 01:01:25 2015 +0200
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Tue Aug 11 09:25:31 2015 -0400

    ExternalProject: Tell "hg clone" not to implicitly update
    
    By default Mercurial command "clone" will implicitly call "update" with
    the "default" branch after downloading the cloned repository.  However
    ExternalProject_Add() always generates a second "update" command after
    cloning with a tag which is either specified or "tip" (equivalent to
    "default" by default).  Therefore ExternalProject will first clone then
    update to default branch then update to another specified branch if
    provided.  This leads to potentially very long clone operation (in
    particular when the repository default branch contain subrepos) which
    can lead to transaction abort triggered by the server.
    
    Simply use "hg clone -U" to avoid the implicit update during clone.
    Our following call to "hg update" will take care of updating anyway.

diff --git a/Modules/ExternalProject.cmake b/Modules/ExternalProject.cmake
index fdb146a..0fbf7c3 100644
--- a/Modules/ExternalProject.cmake
+++ b/Modules/ExternalProject.cmake
@@ -609,7 +609,7 @@ if(error_code)
 endif()
 
 execute_process(
-  COMMAND \"${hg_EXECUTABLE}\" clone \"${hg_repository}\" \"${src_name}\"
+  COMMAND \"${hg_EXECUTABLE}\" clone -U \"${hg_repository}\" \"${src_name}\"
   WORKING_DIRECTORY \"${work_dir}\"
   RESULT_VARIABLE error_code
   )

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

Summary of changes:
 Modules/ExternalProject.cmake |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
CMake