[Cmake-commits] CMake branch, next, updated. v3.6.2-1960-g5ba3f1a

[Nils Gladitz]

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  5ba3f1a9068a6504c8a3ae5987a090c6fe787b40 (commit)
       via  b35311ca44b7e8b40cc48aaac6cefbe8ca4ddba8 (commit)
      from  b727346b4081504076b8fd48550325fa7eb31496 (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 -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5ba3f1a9068a6504c8a3ae5987a090c6fe787b40
commit 5ba3f1a9068a6504c8a3ae5987a090c6fe787b40
Merge: b727346 b35311c
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 12 13:41:35 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Sep 12 13:41:35 2016 -0400

    Merge topic 'fix-ctest-segfault' into next
    
    b35311ca CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b35311ca44b7e8b40cc48aaac6cefbe8ca4ddba8
commit b35311ca44b7e8b40cc48aaac6cefbe8ca4ddba8
Author:     Nils Gladitz <nilsgladitz at gmail.com>
AuthorDate: Mon Sep 12 18:29:08 2016 +0200
Commit:     Nils Gladitz <nilsgladitz at gmail.com>
CommitDate: Mon Sep 12 19:40:13 2016 +0200

    CTestSVN: Fix segfault when CTEST_UPDATE_VERSION_ONLY is enabled
    
    Before the change the list of externals was queried only
    before the svn update.
    
    With the change the list is queried both before and after.
    This should also be more accurate since the list of externals might
    change during the update.

diff --git a/Source/CTest/cmCTestSVN.cxx b/Source/CTest/cmCTestSVN.cxx
index f680612..0832820 100644
--- a/Source/CTest/cmCTestSVN.cxx
+++ b/Source/CTest/cmCTestSVN.cxx
@@ -108,13 +108,8 @@ std::string cmCTestSVN::LoadInfo(SVNInfo& svninfo)
 
 void cmCTestSVN::NoteOldRevision()
 {
-  // Info for root repository
-  this->Repositories.push_back(SVNInfo(""));
-  this->RootInfo = &(this->Repositories.back());
-  // Info for the external repositories
-  this->LoadExternals();
+  this->LoadRepositories();
 
-  // Get info for all the repositories
   std::list<SVNInfo>::iterator itbeg = this->Repositories.begin();
   std::list<SVNInfo>::iterator itend = this->Repositories.end();
   for (; itbeg != itend; itbeg++) {
@@ -134,7 +129,8 @@ void cmCTestSVN::NoteOldRevision()
 
 void cmCTestSVN::NoteNewRevision()
 {
-  // Get info for the external repositories
+  this->LoadRepositories();
+
   std::list<SVNInfo>::iterator itbeg = this->Repositories.begin();
   std::list<SVNInfo>::iterator itend = this->Repositories.end();
   for (; itbeg != itend; itbeg++) {
@@ -534,8 +530,13 @@ private:
   }
 };
 
-void cmCTestSVN::LoadExternals()
+void cmCTestSVN::LoadRepositories()
 {
+  // Info for root repository
+  this->Repositories.clear();
+  this->Repositories.push_back(SVNInfo(""));
+  this->RootInfo = &(this->Repositories.back());
+
   // Run "svn status" to get the list of external repositories
   std::vector<const char*> svn_status;
   svn_status.push_back("status");
diff --git a/Source/CTest/cmCTestSVN.h b/Source/CTest/cmCTestSVN.h
index 6f2374d..2301b10 100644
--- a/Source/CTest/cmCTestSVN.h
+++ b/Source/CTest/cmCTestSVN.h
@@ -86,7 +86,7 @@ private:
   SVNInfo* RootInfo;
 
   std::string LoadInfo(SVNInfo& svninfo);
-  void LoadExternals();
+  void LoadRepositories();
   void LoadModifications() CM_OVERRIDE;
   void LoadRevisions() CM_OVERRIDE;
   void LoadRevisions(SVNInfo& svninfo);

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

Summary of changes:
 Source/CTest/cmCTestSVN.cxx |   17 +++++++++--------
 Source/CTest/cmCTestSVN.h   |    2 +-
 2 files changed, 10 insertions(+), 9 deletions(-)


hooks/post-receive
-- 
CMake