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

Logic Bug

Browse source 
- Fixed large logic bug in start command for bulk operations and
  changes to recurring tasks.
This commit is contained in:
Paul Beckingham 2011-10-11 23:56:25 -04:00
parent 3ec00d9443
commit 887439b914
1 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/commands/CmdStart.cpp
View file

@ -25,7 +25,6 @@
// //
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
#define L10N // Localization complete. #define L10N // Localization complete.
#include <sstream> #include <sstream>
@ -33,6 +32,7 @@
#include <Permission.h> #include <Permission.h>
#include <main.h> #include <main.h>
#include <text.h> #include <text.h>
#include <util.h>
#include <i18n.h> #include <i18n.h>
#include <CmdStart.h> #include <CmdStart.h>
@ -64,7 +64,7 @@ int CmdStart::execute (std::string& output)
return 1; return 1;
} }
// Apply the command line modifications to the started task. // Apply the command line modifications to the new task.
A3 modifications = context.a3.extract_modifications (); A3 modifications = context.a3.extract_modifications ();
Permission permission; Permission permission;
@ -79,34 +79,42 @@ int CmdStart::execute (std::string& output)
{ {
Task before (*task); Task before (*task);
modify_task_annotate (*task, modifications); // Complete the specified task.
std::string question = format (STRING_CMD_START_QUESTION,
task->id,
task->get ("description"));
// Add a start time. modify_task_annotate (*task, modifications);
task->setStart (); task->setStart ();
if (context.config.getBoolean ("journal.time")) if (context.config.getBoolean ("journal.time"))
task->addAnnotation (context.config.get ("journal.time.start.annotation")); task->addAnnotation (context.config.get ("journal.time.start.annotation"));
if (taskDiff (before, *task)) if (permission.confirmed (*task, taskDifferences (before, *task) + question))
{
if (permission.confirmed (before, taskDifferences (before, *task) + STRING_CMD_DONE_PROCEED))
{ {
updateRecurrenceMask (*task);
context.tdb2.modify (*task); context.tdb2.modify (*task);
if (!nagged)
nagged = nag (*task);
++count; ++count;
if (context.verbose ("affected") || if (context.verbose ("affected") ||
context.config.getBoolean ("echo.command")) // Deprecated 2.0 context.config.getBoolean ("echo.command")) // Deprecated 2.0
out << format (STRING_CMD_START_DONE, out << format (task->has ("parent")
? STRING_CMD_START_RECURRING
: STRING_CMD_START_TASK,
task->id, task->id,
task->get ("description")) task->get ("description"))
<< "\n"; << "\n";
dependencyChainOnStart (*task); dependencyChainOnStart (*task);
context.footnote (onProjectChange (*task, false));
} }
else
{
out << format (STRING_CMD_START_NOT, task->id) << "\n";
rc = 1;
} }
if (!nagged)
nagged = nag (*task);
} }
else else
{ {
@ -119,6 +127,15 @@ int CmdStart::execute (std::string& output)
} }
context.tdb2.commit (); context.tdb2.commit ();
if (context.verbose ("affected") ||
context.config.getBoolean ("echo.command")) // Deprecated 2.0
out << format ((count == 1
? STRING_CMD_START_STARTED
: STRING_CMD_START_STARTED_N),
count)
<< "\n";
output = out.str (); output = out.str ();
return rc; return rc;
} }