[Cmake-commits] [cmake-commits] king committed cmCTestUpdateHandler.cxx 1.51 1.52

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestUpdateHandler.cxx 
Log Message:
STYLE: Fix spelling in cmCTestUpdateHandler

This renames the variable 'numModiefied' to 'numModified' to fix its
spelling.  It also renames 'modifiedOrConflict' to 'notLocallyModified'
to describe its purpose (rather than the opposite of its purpose).
See issue #8168.


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.51
retrieving revision 1.52
diff -C 2 -d -r1.51 -r1.52
*** cmCTestUpdateHandler.cxx	5 Feb 2009 21:31:37 -0000	1.51
--- cmCTestUpdateHandler.cxx	16 Feb 2009 15:00:58 -0000	1.52
***************
*** 695,699 ****
    cmCTestUpdateHandler::AuthorsToUpdatesMap authors_files_map;
    int numUpdated = 0;
!   int numModiefied = 0;
    int numConflicting = 0;
    // In subversion, get the latest revision
--- 695,699 ----
    cmCTestUpdateHandler::AuthorsToUpdatesMap authors_files_map;
    int numUpdated = 0;
!   int numModified = 0;
    int numConflicting = 0;
    // In subversion, get the latest revision
***************
*** 752,756 ****
        std::string upFile = file_update_line.match(2);
        char mod = upChar[0];
!       bool modifiedOrConflict = false;
        if ( mod == 'X' || mod == 'L')
          {
--- 752,756 ----
        std::string upFile = file_update_line.match(2);
        char mod = upChar[0];
!       bool notLocallyModified = false;
        if ( mod == 'X' || mod == 'L')
          {
***************
*** 760,764 ****
          {
          count ++;
!         modifiedOrConflict = true;
          }
        const char* file = upFile.c_str();
--- 760,764 ----
          {
          count ++;
!         notLocallyModified = true;
          }
        const char* file = upFile.c_str();
***************
*** 767,771 ****
  
        std::string output;
!       if ( modifiedOrConflict )
          {
          std::string logcommand;
--- 767,771 ----
  
        std::string output;
!       if ( notLocallyModified )
          {
          std::string logcommand;
***************
*** 995,999 ****
          else if ( mod == 'M' )
            {
!           numModiefied ++;
            os << "\t<Modified>" << std::endl;
            }
--- 995,999 ----
          else if ( mod == 'M' )
            {
!           numModified ++;
            os << "\t<Modified>" << std::endl;
            }
***************
*** 1091,1097 ****
        << " updated files" << std::endl);
      }
!   if ( numModiefied )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Found " << numModiefied
        << " locally modified files"
        << std::endl);
--- 1091,1097 ----
        << " updated files" << std::endl);
      }
!   if ( numModified )
      {
!     cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Found " << numModified
        << " locally modified files"
        << std::endl);
***************
*** 1103,1107 ****
        << std::endl);
      }
!   if ( numModiefied == 0 && numConflicting == 0 && numUpdated == 0 )
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Project is up-to-date"
--- 1103,1107 ----
        << std::endl);
      }
!   if ( numModified == 0 && numConflicting == 0 && numUpdated == 0 )
      {
      cmCTestLog(this->CTest, HANDLER_OUTPUT, "   Project is up-to-date"
***************
*** 1138,1142 ****
      << "</ElapsedMinutes>\n"
      << "\t<UpdateReturnStatus>";
!   if ( numModiefied > 0 || numConflicting > 0 )
      {
      os << "Update error: There are modified or conflicting files in the "
--- 1138,1142 ----
      << "</ElapsedMinutes>\n"
      << "\t<UpdateReturnStatus>";
!   if ( numModified > 0 || numConflicting > 0 )
      {
      os << "Update error: There are modified or conflicting files in the "