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

Browse source 
- Fixed problem where 'project' was not supported as a verbosity token (thanks
  to Adam Gibbins).
This commit is contained in:
Paul Beckingham 2012-03-17 10:11:55 -04:00
parent deb12102f6
commit 80d6655709
17 changed files with 35 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Config.cpp
View file

@ -82,7 +82,7 @@ std::string Config::_defaults =
"#verbose=no # Provide regular feedback\n"
"#verbose=nothing # Provide no feedback\n"
"# # Comma-separated list. May contain any subset of:\n"
"#verbose=blank,header,footnote,label,new-id,affected,edit,special\n"
"#verbose=blank,header,footnote,label,new-id,affected,edit,special,project\n"
"confirmation=yes # Confirmation on delete, big changes\n"
"annotations=full # Level of verbosity for annotations: full, sparse or none\n"
"indent.annotation=2 # Indent spaces for annotations\n"

4
src/Context.cpp
View file

@ -452,7 +452,8 @@ bool Context::verbose (const std::string& token)
verbosity[0] != "new-id" && //
verbosity[0] != "affected" && //
verbosity[0] != "edit" && //
verbosity[0] != "special") //
verbosity[0] != "special" && //
verbosity[0] != "project") //
{
verbosity.clear ();
@ -464,6 +465,7 @@ bool Context::verbose (const std::string& token)
verbosity.push_back ("affected");
verbosity.push_back ("edit");
verbosity.push_back ("special");
verbosity.push_back ("project");
}
}

5
src/commands/CmdAdd.cpp
View file

@ -56,12 +56,11 @@ int CmdAdd::execute (std::string& output)
modify_task_description_replace (task, context.a3.extract_modifications ());
context.tdb2.add (task);
// TODO This should be a call in to feedback.cpp.
if (context.verbose ("new-id"))
output = format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
// TODO verbosity token.
context.footnote (onProjectChange (task));
if (context.verbose ("project"))
context.footnote (onProjectChange (task));
context.tdb2.commit ();
return rc;

3
src/commands/CmdAnnotate.cpp
View file

@ -84,7 +84,8 @@ int CmdAnnotate::execute (std::string& output)
context.tdb2.modify (*task);
++count;
feedback_affected (STRING_CMD_ANNO_TASK, *task);
context.footnote (onProjectChange (*task, true));
if (context.verbose ("project"))
context.footnote (onProjectChange (*task, true));
// Annotate siblings.
if (task->has ("parent"))

3
src/commands/CmdAppend.cpp
View file

@ -87,7 +87,8 @@ int CmdAppend::execute (std::string& output)
context.tdb2.modify (*task);
++count;
feedback_affected (STRING_CMD_APPEND_TASK, *task);
projectChanges[task->get ("project")] = onProjectChange (*task, true);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, true);
// Append to siblings.
if (task->has ("parent"))

3
src/commands/CmdDelete.cpp
View file

@ -102,7 +102,8 @@ int CmdDelete::execute (std::string& output)
feedback_affected (STRING_CMD_DELETE_TASK, *task);
feedback_unblocked (*task);
dependencyChainOnComplete (*task);
projectChanges[task->get ("project")] = onProjectChange (*task, true);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, true);
// Delete siblings.
if (task->has ("parent"))

3
src/commands/CmdDone.cpp
View file

@ -103,7 +103,8 @@ int CmdDone::execute (std::string& output)
if (!nagged)
nagged = nag (*task);
dependencyChainOnComplete (*task);
projectChanges[task->get ("project")] = onProjectChange (*task, false);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, false);
}
else
{

3
src/commands/CmdDuplicate.cpp
View file

@ -117,7 +117,8 @@ int CmdDuplicate::execute (std::string& output)
if (context.verbose ("new-id"))
std::cout << format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
projectChanges[task->get ("project")] = onProjectChange (*task, false);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, false);
}
else
{

3
src/commands/CmdLog.cpp
View file

@ -65,7 +65,8 @@ int CmdLog::execute (std::string& output)
throw std::string (STRING_CMD_LOG_NO_WAITING);
context.tdb2.add (task);
context.footnote (onProjectChange (task));
if (context.verbose ("project"))
context.footnote (onProjectChange (task));
context.tdb2.commit ();
if (context.verbose ("affected") ||

9
src/commands/CmdModify.cpp
View file

@ -112,7 +112,8 @@ int CmdModify::execute (std::string& output)
feedback_affected (STRING_CMD_MODIFY_TASK, *task);
feedback_unblocked (*task);
context.tdb2.modify (*task);
projectChanges[task->get ("project")] = onProjectChange (before, *task);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (before, *task);
// Task potentially has siblings - modify them.
if (task->has ("parent"))
@ -132,7 +133,8 @@ int CmdModify::execute (std::string& output)
feedback_affected (STRING_CMD_MODIFY_TASK_R, *sibling);
feedback_unblocked (*sibling);
context.tdb2.modify (*sibling);
projectChanges[sibling->get ("project")] = onProjectChange (alternate, *sibling);
if (context.verbose ("project"))
projectChanges[sibling->get ("project")] = onProjectChange (alternate, *sibling);
}
}
}
@ -152,7 +154,8 @@ int CmdModify::execute (std::string& output)
updateRecurrenceMask (*child);
context.tdb2.modify (*child);
dependencyChainOnModify (alternate, *child);
projectChanges[child->get ("project")] = onProjectChange (alternate, *child);
if (context.verbose ("project"))
projectChanges[child->get ("project")] = onProjectChange (alternate, *child);
++count;
feedback_affected (STRING_CMD_MODIFY_TASK_R, *child);
}

3
src/commands/CmdPrepend.cpp
View file

@ -87,7 +87,8 @@ int CmdPrepend::execute (std::string& output)
context.tdb2.modify (*task);
++count;
feedback_affected (STRING_CMD_PREPEND_TASK, *task);
projectChanges[task->get ("project")] = onProjectChange (*task, true);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, true);
// Prepend to siblings.
if (task->has ("parent"))

3
src/commands/CmdStart.cpp
View file

@ -96,7 +96,8 @@ int CmdStart::execute (std::string& output)
if (!nagged)
nagged = nag (*task);
dependencyChainOnStart (*task);
projectChanges[task->get ("project")] = onProjectChange (*task, false);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, false);
}
else
{

3
src/commands/CmdStop.cpp
View file

@ -92,7 +92,8 @@ int CmdStop::execute (std::string& output)
++count;
feedback_affected (STRING_CMD_STOP_TASK, *task);
dependencyChainOnStart (*task);
projectChanges[task->get ("project")] = onProjectChange (*task, false);
if (context.verbose ("project"))
projectChanges[task->get ("project")] = onProjectChange (*task, false);
}
else
{