[Cmake-commits] [cmake-commits] hoffman committed cmCTestUpdateHandler.cxx 1.41 1.41.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmCTestUpdateHandler.cxx 
Log Message:
ENH: merge in changes for 2.6.3 RC 1


Index: cmCTestUpdateHandler.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestUpdateHandler.cxx,v
retrieving revision 1.41
retrieving revision 1.41.2.1
diff -C 2 -d -r1.41 -r1.41.2.1
*** cmCTestUpdateHandler.cxx	31 Jan 2008 21:38:14 -0000	1.41
--- cmCTestUpdateHandler.cxx	24 Oct 2008 15:18:55 -0000	1.41.2.1
***************
*** 253,256 ****
--- 253,269 ----
    std::string errors;
  
+   // make sure 
+   std::string saveLCMessages;
+   const char* lcmess = cmSystemTools::GetEnv("LC_MESSAGES");
+   if(lcmess)
+     {
+     saveLCMessages = lcmess;
+     }
+   // if LC_MESSAGES is not set to C, then 
+   // set it, so that svn/cvs info will be in english ascii
+   if(! (lcmess && strcmp(lcmess, "C") == 0))
+     {
+     cmSystemTools::PutEnv("LC_MESSAGES=C");
+     }
    std::string checkoutErrorMessages;
    int retVal = 0;
***************
*** 641,645 ****
  
    cmsys::RegularExpression file_removed_line(
!     "cvs update: `(.*)' is no longer in the repository");
    cmsys::RegularExpression file_update_line("([A-Z])  *(.*)");
    std::string current_path = "<no-path>";
--- 654,660 ----
  
    cmsys::RegularExpression file_removed_line(
!     "cvs update: `?([^']*)'? is no longer in the repository");
!   cmsys::RegularExpression file_removed_line2(
!     "cvs update: warning: `?([^']*)'? is not \\(any longer\\) pertinent");
    cmsys::RegularExpression file_update_line("([A-Z])  *(.*)");
    std::string current_path = "<no-path>";
***************
*** 690,693 ****
--- 705,713 ----
        line = removed_line.c_str();
        }
+     else if ( file_removed_line2.find(line) )
+       {
+       removed_line = "D " + file_removed_line2.match(1);
+       line = removed_line.c_str();
+       }
      if ( file_update_line.find(line) )
        {
***************
*** 701,705 ****
        char mod = upChar[0];
        bool modifiedOrConflict = false;
!       if ( mod == 'X')
          {
          continue;
--- 721,725 ----
        char mod = upChar[0];
        bool modifiedOrConflict = false;
!       if ( mod == 'X' || mod == 'L')
          {
          continue;
***************
*** 1103,1107 ****
    os << "</UpdateReturnStatus>" << std::endl;
    os << "</Update>" << std::endl;
! 
    if (! res  )
      {
--- 1123,1138 ----
    os << "</UpdateReturnStatus>" << std::endl;
    os << "</Update>" << std::endl;
!   // restore the value of LC_MESSAGES after running the version control
!   // commands
!   if(saveLCMessages.size())
!     {
!     std::string put = "LC_MESSAGES=";
!     put += saveLCMessages;
!     cmSystemTools::PutEnv(put.c_str());
!     }
!   else
!     {
!     cmSystemTools::UnsetEnv("LC_MESSAGES");
!     }
    if (! res  )
      {