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

Change scm::status::note → unknown where applicable

Browse Source
This commit is contained in:
Allan Odgaard
2012-09-02 17:08:29 +02:00
parent f3429d8aad
commit 02b2ef3982
4 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/file/src/path_info.cc
View File

@@ -139,7 +139,7 @@ namespace file
if(branch != NULL_STR)
res.push_back("attr.scm.branch." + branch);
scm::status::type status = info->status(path);
if(status != scm::status::none)
if(status != scm::status::unknown)
res.push_back("attr.scm.status." + to_s(status));
}
}

36
Frameworks/scm/src/drivers/git.cc
View File

@@ -26,7 +26,7 @@ static scm::status::type parse_status_flag (std::string const& str)
return it->second;
ASSERT_EQ(str, NULL_STR); // we use ‘str’ in the assertion to output the unrecognized status flag
return scm::status::none;
return scm::status::unknown;
}
static void parse_diff (std::map<std::string, scm::status::type>& entries, std::string const& output)
@@ -41,7 +41,7 @@ static void parse_diff (std::map<std::string, scm::status::type>& entries, std::
entries[v[i+1]] = parse_status_flag(v[i]);
}
static void parse_ls (std::map<std::string, scm::status::type>& entries, std::string const& output, scm::status::type state = scm::status::none)
static void parse_ls (std::map<std::string, scm::status::type>& entries, std::string const& output, scm::status::type state = scm::status::unknown)
{
if(output == NULL_STR)
return;
@@ -52,7 +52,7 @@ static void parse_ls (std::map<std::string, scm::status::type>& entries, std::st
iterate(str, v)
{
ASSERT_EQ((*str)[1], ' ');
entries[str->substr(2)] = state != scm::status::none ? state : parse_status_flag(str->substr(0, 1));
entries[str->substr(2)] = state != scm::status::unknown ? state : parse_status_flag(str->substr(0, 1));
}
}
@@ -170,31 +170,31 @@ static scm::status::type status_for (entry_t const& root)
if(!root.is_dir())
return root.status();
size_t unknown = 0, ignored = 0, tracked = 0, modified = 0, added = 0, deleted = 0, mixed = 0;
size_t untracked = 0, ignored = 0, tracked = 0, modified = 0, added = 0, deleted = 0, mixed = 0;
citerate(entry, root.entries())
{
switch(status_for(*entry))
{
case scm::status::unversioned: ++unknown; break;
case scm::status::ignored: ++ignored; break;
case scm::status::versioned: ++tracked; break;
case scm::status::modified: ++modified; break;
case scm::status::added: ++added; break;
case scm::status::deleted: ++deleted; break;
case scm::status::mixed: ++mixed; break;
case scm::status::unversioned: ++untracked; break;
case scm::status::ignored: ++ignored; break;
case scm::status::versioned: ++tracked; break;
case scm::status::modified: ++modified; break;
case scm::status::added: ++added; break;
case scm::status::deleted: ++deleted; break;
case scm::status::mixed: ++mixed; break;
}
}
if(mixed > 0) return scm::status::mixed;
size_t total=unknown + ignored + tracked + modified + added + deleted;
size_t total = untracked + ignored + tracked + modified + added + deleted;
if(total == unknown) return scm::status::unversioned;
if(total == ignored) return scm::status::none;
if(total == tracked) return scm::status::versioned;
if(total == modified) return scm::status::modified;
if(total == added) return scm::status::added;
if(total == deleted) return scm::status::deleted;
if(total == untracked) return scm::status::unversioned;
if(total == ignored) return scm::status::none;
if(total == tracked) return scm::status::versioned;
if(total == modified) return scm::status::modified;
if(total == added) return scm::status::added;
if(total == deleted) return scm::status::deleted;
if(total > 0) return scm::status::mixed;

2
Frameworks/scm/src/drivers/hg.cc
View File

@@ -26,7 +26,7 @@ static scm::status::type parse_status_flag (char flag)
}
ASSERT_EQ(flag, '\0'); // we use ‘flag’ in the assertion to output the unrecognized status flag
return scm::status::none;
return scm::status::unknown;
}
static void parse_status_output (scm::status_map_t& entries, std::string const& output)

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

@@ -31,7 +31,7 @@ static scm::status::type parse_status_string (std::string const& status)
};
auto it = StatusMap.find(status);
return it != StatusMap.end() ? it->second : scm::status::none;
return it != StatusMap.end() ? it->second : scm::status::unknown;
}
static void parse_status_output (scm::status_map_t& entries, std::string const& output)