github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Make svn status parser more robust

Browse Source 
I assume issue #340 is because of unexpected output from svn which would cause problems for the parser.
This commit is contained in:
Allan Odgaard
2012-08-31 00:04:08 +02:00
parent 9940e4b321
commit 74961834e0
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
Frameworks/scm/src/drivers/svn.cc
View File

@@ -35,26 +35,21 @@ static scm::status::type parse_status_string (std::string const& status)
static void parse_status_output (scm::status_map_t& entries, std::string const& output)
{
if(output == NULL_STR)
return;
std::vector<std::string> v = text::split(output, "\n");
ASSERT_EQ(v.back(), "");
v.pop_back();
iterate(line, v)
citerate(line, text::tokenize(output.begin(), output.end(), '\n'))
{
// Massaged Subversion output is as follows: 'FILE_PATH\0FILE_STATUS\0FILE_PROPS_STATUS'
std::vector<std::string> v2 = text::split((*line), std::string(1, '\0'));
ASSERT_EQ(v2.size(), 3);
std::string file_path = v2[0];
std::string file_status = v2[1];
std::string file_props_status = v2[2];
std::vector<std::string> cols = text::split((*line), std::string(1, '\0'));
if(cols.size() == 3)
{
std::string const& file_path = cols[0];
std::string const& file_status = cols[1];
std::string const& file_props_status = cols[2];
// If the file's status is not normal/none, use the file's status, otherwise use the file's property status
if(file_status != "normal" || file_status != "none")
entries[file_path] = parse_status_string(file_status);
else
entries[file_path] = parse_status_string(file_props_status);
// If the file's status is not normal/none, use the file's status, otherwise use the file's property status
if(file_status != "normal" || file_status != "none")
entries[file_path] = parse_status_string(file_status);
else entries[file_path] = parse_status_string(file_props_status);
}
}
}