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

Account for svn returning relative paths

Browse Source 
Starting with subversion 1.8 we get back relative paths from ‘svn status’ so we need to prepend the working directory path.

I also made a few minor stylistic changes while touching the relevant function.
This commit is contained in:
Allan Odgaard
2013-07-24 15:55:47 +02:00
parent 974d027f23
commit d17fb1ad7c
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,26 +35,26 @@ static scm::status::type parse_status_string (std::string const& status)
return it != StatusMap->end() ? it->second : scm::status::unknown;
}
static void parse_status_output (scm::status_map_t& entries, std::string const& output)
static void parse_status_output (scm::status_map_t& entries, std::string const& output, std::string const& dir)
{
citerate(line, text::tokenize(output.begin(), output.end(), '\n'))
for(auto const& line : text::tokenize(output.begin(), output.end(), '\n'))
{
// Massaged Subversion output is as follows: 'FILE_STATUS FILE_PROPS_STATUS FILE_PATH'
std::vector<std::string> cols = text::split((*line), " ");
std::vector<std::string> cols = text::split(line, " ");
if(cols.size() == 3)
{
std::string const& file_status = cols[0];
std::string const& file_props_status = cols[1];
std::string const& file_path = cols[2];
std::string const file_status = cols[0];
std::string const file_props_status = cols[1];
std::string const file_path = path::join(dir, 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);
}
else if((*line).size())
else if(line.size())
{
fprintf(stderr, "TextMate/svn: Unexpected line: ‘%s’\n", (*line).c_str());
fprintf(stderr, "TextMate/svn: Unexpected line: ‘%s’\n", line.c_str());
}
}
}
@@ -80,7 +80,7 @@ static void collect_all_paths (std::string const& svn, std::string const& xsltPa
{
ASSERT_NE(svn, NULL_STR); ASSERT_NE(xsltPath, NULL_STR);
std::string const cmd = text::format("%s status --no-ignore --xml %s|/usr/bin/xsltproc %s -", shell_quote(svn).c_str(), shell_quote(dir).c_str(), shell_quote(xsltPath).c_str());
parse_status_output(entries, io::exec("/bin/sh", "-c", cmd.c_str(), NULL));
parse_status_output(entries, io::exec("/bin/sh", "-c", cmd.c_str(), NULL), dir);
}
namespace scm