GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Bug #1065

Browse source 
- Fixed bug #1065, where CmdShow issued messages in incorrect situations.
- Added unit tests.
This commit is contained in:
Scott Kostyshak 2012-08-12 15:35:59 -04:00 • committed by Paul Beckingham
parent 8d66d801c0
commit 7b0b3210a5
3 changed files with 96 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/commands/CmdShow.cpp
View file

@ -264,6 +264,9 @@ int CmdShow::execute (std::string& output)
Color error ("bold white on red");
Color warning ("black on yellow");
bool issue_error = false;
bool issue_warning = false;
std::string section;
// Look for the first plausible argument which could be a pattern
@ -281,9 +284,15 @@ int CmdShow::execute (std::string& output)
// Look for unrecognized.
Color color;
if (std::find (unrecognized.begin (), unrecognized.end (), *i) != unrecognized.end ())
{
issue_error = true;
color = error;
}
else if (std::find (default_values.begin (), default_values.end (), *i) != default_values.end ())
{
issue_warning = true;
color = warning;
}
std::string value = context.config.get (*i);
// hide sensible information
@ -307,7 +316,7 @@ int CmdShow::execute (std::string& output)
<< (view.rows () == 0 ? STRING_CMD_SHOW_NONE : "")
<< (view.rows () == 0 ? "\n\n" : "\n");
if (default_values.size ())
if (issue_warning)
{
out << STRING_CMD_SHOW_DIFFER;
@ -318,7 +327,7 @@ int CmdShow::execute (std::string& output)
}
// Display the unrecognized variables.
if (unrecognized.size ())
if (issue_error)
{
out << STRING_CMD_SHOW_UNREC << "\n";