[Cmake-commits] [cmake-commits] hoffman committed cmCTestUpdateHandler.cxx 1.41.2.2 1.41.2.3

cmake-commits at cmake.org cmake-commits at cmake.org
Mon Mar 23 13:58:51 EDT 2009


Update of /cvsroot/CMake/CMake/Source/CTest
In directory public:/mounts/ram/cvs-serv2063/Source/CTest

Modified Files:
      Tag: CMake-2-6
	cmCTestUpdateHandler.cxx 
Log Message:
ENH: check in changes to branch, most importantly the header file do not compile fix


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.41.2.2
retrieving revision 1.41.2.3
diff -C 2 -d -r1.41.2.2 -r1.41.2.3
*** cmCTestUpdateHandler.cxx	13 Jan 2009 18:03:54 -0000	1.41.2.2
--- cmCTestUpdateHandler.cxx	23 Mar 2009 17:58:49 -0000	1.41.2.3
***************
*** 694,698 ****
    cmCTestUpdateHandler::AuthorsToUpdatesMap authors_files_map;
    int numUpdated = 0;
!   int numModiefied = 0;
    int numConflicting = 0;
    // In subversion, get the latest revision
--- 694,698 ----
    cmCTestUpdateHandler::AuthorsToUpdatesMap authors_files_map;
    int numUpdated = 0;
!   int numModified = 0;
    int numConflicting = 0;
    // In subversion, get the latest revision
***************
*** 751,755 ****
        std::string upFile = file_update_line.match(2);
        char mod = upChar[0];
!       bool modifiedOrConflict = false;
        if ( mod == 'X' || mod == 'L')
          {
--- 751,755 ----
        std::string upFile = file_update_line.match(2);
        char mod = upChar[0];
!       bool notLocallyModified = false;
        if ( mod == 'X' || mod == 'L')
          {
***************
*** 759,763 ****
          {
          count ++;
!         modifiedOrConflict = true;
          }
        const char* file = upFile.c_str();
--- 759,763 ----
          {
          count ++;
!         notLocallyModified = true;
          }
        const char* file = upFile.c_str();
***************
*** 766,770 ****
  
        std::string output;
!       if ( modifiedOrConflict )
          {
          std::string logcommand;
--- 766,770 ----
  
        std::string output;
!       if ( notLocallyModified )
          {
          std::string logcommand;
***************
*** 807,810 ****
--- 807,814 ----
            }
          }
+       else
+         {
+         res = false;
+         }
        if ( res )
          {
***************
*** 994,998 ****
          else if ( mod == 'M' )
            {
!           numModiefied ++;
            os << "\t<Modified>" << std::endl;
            }
--- 998,1002 ----
          else if ( mod == 'M' )
            {
!           numModified ++;
            os << "\t<Modified>" << std::endl;
            }
***************
*** 1090,1096 ****
        << " updated files" << std::endl);
      }
!   if ( numModiefied )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Found " << numModiefied
        << " locally modified files"
        << std::endl);
--- 1094,1100 ----
        << " updated files" << std::endl);
      }
!   if ( numModified )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Found " << numModified
        << " locally modified files"
        << std::endl);
***************
*** 1102,1106 ****
        << std::endl);
      }
!   if ( numModiefied == 0 && numConflicting == 0 && numUpdated == 0 )
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Project is up-to-date"
--- 1106,1110 ----
        << std::endl);
      }
!   if ( numModified == 0 && numConflicting == 0 && numUpdated == 0 )
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Project is up-to-date"
***************
*** 1137,1141 ****
      << "</ElapsedMinutes>\n"
      << "\t<UpdateReturnStatus>";
!   if ( numModiefied > 0 || numConflicting > 0 )
      {
      os << "Update error: There are modified or conflicting files in the "
--- 1141,1145 ----
      << "</ElapsedMinutes>\n"
      << "\t<UpdateReturnStatus>";
!   if ( numModified > 0 || numConflicting > 0 )
      {
      os << "Update error: There are modified or conflicting files in the "



More information about the Cmake-commits mailing list