[Cmake-commits] [cmake-commits] king committed cmCTestCVS.cxx 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	cmCTestCVS.cxx 
Log Message:
BUG: Fix CVS update parsing for TortoiseCVS

The TortoiseCVS version of cvs.exe includes the '.exe' in cvs update
messages for files removed from the repository.  This change accounts
for it in the regular expressions that match such lines.  Now removed
files are properly reported by ctest_update() when using TortoiseCVS.


Index: cmCTestCVS.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/CTest/cmCTestCVS.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -C 2 -d -r1.3 -r1.4
*** cmCTestCVS.cxx	29 Apr 2009 18:20:40 -0000	1.3
--- cmCTestCVS.cxx	23 Jun 2009 13:06:13 -0000	1.4
***************
*** 45,51 ****
      this->RegexFileConflicting.compile("^([C])  *(.*)");
      this->RegexFileRemoved1.compile(
!       "cvs update: `?([^']*)'? is no longer in the repository");
      this->RegexFileRemoved2.compile(
!       "cvs update: warning: `?([^']*)'? is not \\(any longer\\) pertinent");
      }
  private:
--- 45,52 ----
      this->RegexFileConflicting.compile("^([C])  *(.*)");
      this->RegexFileRemoved1.compile(
!       "cvs[^ ]* update: `?([^']*)'? is no longer in the repository");
      this->RegexFileRemoved2.compile(
!       "cvs[^ ]* update: "
!       "warning: `?([^']*)'? is not \\(any longer\\) pertinent");
      }
  private: