kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

cmCTestBZR: Strip trailing slashes from paths 

Our internal path processing methods assume no trailing slashes, but bzr
adds trailing slashes to updated directories.  This can lead to empty
entries in Update.xml files.  We address the problem by stripping the
slashes as soon as they are parsed.
This commit is contained in:
Brad King 2010-02-09 13:31:12 -05:00
parent 9ff55c0ebe
commit 2ec78b4de7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Source/CTest/cmCTestBZR.cxx
View File

@ -276,12 +276,14 @@ private:
&& !this->CData.empty()) && !this->CData.empty())
{ {
this->CurChange.Path.assign(&this->CData[0], this->CData.size()); this->CurChange.Path.assign(&this->CData[0], this->CData.size());
cmSystemTools::ConvertToUnixSlashes(this->CurChange.Path);
this->Changes.push_back(this->CurChange); this->Changes.push_back(this->CurChange);
} }
else if(strcmp(name, "symlink") == 0 && !this->CData.empty()) else if(strcmp(name, "symlink") == 0 && !this->CData.empty())
{ {
// symlinks have an arobase at the end in the log // symlinks have an arobase at the end in the log
this->CurChange.Path.assign(&this->CData[0], this->CData.size()-1); this->CurChange.Path.assign(&this->CData[0], this->CData.size()-1);
cmSystemTools::ConvertToUnixSlashes(this->CurChange.Path);
this->Changes.push_back(this->CurChange); this->Changes.push_back(this->CurChange);
} }
else if(strcmp(name, "committer") == 0 && !this->CData.empty()) else if(strcmp(name, "committer") == 0 && !this->CData.empty())
@ -377,9 +379,10 @@ private:
return true; return true;
} }
void DoPath(char c0, char c1, char c2, std::string const& path) void DoPath(char c0, char c1, char c2, std::string path)
{ {
if(path.empty()) return; if(path.empty()) return;
cmSystemTools::ConvertToUnixSlashes(path);
const std::string dir = cmSystemTools::GetFilenamePath(path); const std::string dir = cmSystemTools::GetFilenamePath(path);
const std::string name = cmSystemTools::GetFilenameName(path); const std::string name = cmSystemTools::GetFilenameName(path);
@ -488,9 +491,10 @@ private:
return true; return true;
} }
void DoPath(char c0, char c1, char c2, std::string const& path) void DoPath(char c0, char c1, char c2, std::string path)
{ {
if(path.empty()) return; if(path.empty()) return;
cmSystemTools::ConvertToUnixSlashes(path);
if ( c0=='C' ) if ( c0=='C' )
{ {