From 66953c78a9457e9e73db5a35816333223e6414ae Mon Sep 17 00:00:00 2001 From: Brad King Date: Tue, 23 Jun 2009 09:06:13 -0400 Subject: [PATCH] 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. --- Source/CTest/cmCTestCVS.cxx | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Source/CTest/cmCTestCVS.cxx b/Source/CTest/cmCTestCVS.cxx index cbd201e89..18ec0ec3c 100644 --- a/Source/CTest/cmCTestCVS.cxx +++ b/Source/CTest/cmCTestCVS.cxx @@ -44,9 +44,10 @@ public: this->RegexFileModified.compile("^([MRA]) *(.*)"); this->RegexFileConflicting.compile("^([C]) *(.*)"); this->RegexFileRemoved1.compile( - "cvs update: `?([^']*)'? is no longer in the repository"); + "cvs[^ ]* update: `?([^']*)'? is no longer in the repository"); this->RegexFileRemoved2.compile( - "cvs update: warning: `?([^']*)'? is not \\(any longer\\) pertinent"); + "cvs[^ ]* update: " + "warning: `?([^']*)'? is not \\(any longer\\) pertinent"); } private: cmCTestCVS* CVS;