Merge branch '2.2.0' of tasktools.org:task into 2.2.0

doc/man/task.1.in

@@ -788,6 +788,8 @@ task ... due:20120314T223000Z
 
 .TP
 Relative wording
+task ... due:now
+.br
 task ... due:today
 .br
 task ... due:yesterday
@@ -805,7 +807,7 @@ task ... due:1day
 task ... due:9hrs
 
 .TP
-Start of (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
+Start of next (work) week (Monday), calendar week (Sunday or Monday), month, quarter and year
 .br
 task ... due:sow
 .br
@@ -820,7 +822,7 @@ task ... due:soq
 task ... due:soy
 
 .TP
-End of (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
+End of current (work) week (Friday), calendar week (Saturday or Sunday), month, quarter and year
 .br
 task ... due:eow
 .br

src/commands/CmdAnnotate.cpp

@@ -117,10 +117,10 @@ int CmdAnnotate::execute (std::string& output)
     else
     {
       std::cout << STRING_CMD_ANNO_NO << "\n";
-      rc  = 1;
+      rc = 1;
+      if (_permission_quit)
+        break;
     }
-    if (_permission_quit)
-      break;
   }
 
   // Now list the project changes.

src/commands/CmdAppend.cpp

@@ -117,10 +117,10 @@ int CmdAppend::execute (std::string& output)
     else
     {
       std::cout << STRING_CMD_APPEND_NO << "\n";
-      rc  = 1;
+      rc = 1;
+      if (_permission_quit)
+        break;
     }
-    if (_permission_quit)
-      break;
   }
 
   // Now list the project changes.

src/commands/CmdDelete.cpp

@@ -141,10 +141,10 @@ int CmdDelete::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_DELETE_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
     else
     {

src/commands/CmdDenotate.cpp

@@ -130,10 +130,10 @@ int CmdDenotate::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_DENO_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
     else
     {

src/commands/CmdDone.cpp

@@ -99,7 +99,6 @@ int CmdDone::execute (std::string& output)
         ++count;
         feedback_affected (STRING_CMD_DONE_TASK, *task);
         feedback_unblocked (*task);
-        context.tdb2.modify (*task);
         if (!nagged)
           nagged = nag (*task);
         dependencyChainOnComplete (*task);
@@ -109,10 +108,10 @@ int CmdDone::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_DONE_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
     else
     {

src/commands/CmdDuplicate.cpp

@@ -123,10 +123,10 @@ int CmdDuplicate::execute (std::string& output)
     else
     {
       std::cout << STRING_CMD_DUPLICATE_NO << "\n";
-      rc  = 1;
+      rc = 1;
+      if (_permission_quit)
+        break;
     }
-    if (_permission_quit)
-      break;
   }
 
   // Now list the project changes.

src/commands/CmdModify.cpp

@@ -160,10 +160,10 @@ int CmdModify::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_MODIFY_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
   }
 

src/commands/CmdPrepend.cpp

@@ -117,10 +117,10 @@ int CmdPrepend::execute (std::string& output)
     else
     {
       std::cout << STRING_CMD_PREPEND_NO << "\n";
-      rc  = 1;
+      rc = 1;
+      if (_permission_quit)
+        break;
     }
-    if (_permission_quit)
-      break;
   }
 
   // Now list the project changes.

src/commands/CmdStart.cpp

@@ -102,10 +102,10 @@ int CmdStart::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_START_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
     else
     {

src/commands/CmdStop.cpp

@@ -98,10 +98,10 @@ int CmdStop::execute (std::string& output)
       else
       {
         std::cout << STRING_CMD_STOP_NO << "\n";
-        rc  = 1;
+        rc = 1;
+        if (_permission_quit)
+          break;
       }
-      if (_permission_quit)
-        break;
     }
     else
     {

src/rules.cpp

@@ -273,7 +273,7 @@ static void colorizeCompleted (Task& task, const Color& base, Color& c)
 ////////////////////////////////////////////////////////////////////////////////
 static void colorizeDeleted (Task& task, const Color& base, Color& c)
 {
-  if (task.getStatus () == Task::completed)
+  if (task.getStatus () == Task::deleted)
     c.blend (base);
 }
 

test/date.t.cpp

@@ -41,7 +41,7 @@ int main (int argc, char** argv)
   {
     Date now;
     Date yesterday;
-    yesterday -= 1;
+    yesterday -= 86400;
 
     t.ok    (yesterday <= now,       "yesterday <= now");
     t.ok    (yesterday <  now,       "yesterday < now");
@@ -140,7 +140,7 @@ int main (int argc, char** argv)
     t.is (happyNewYear.day (),       1, "1/1/2008 == 1");
     t.is (happyNewYear.year (),   2008, "1/1/2008 == 2008");
 
-    t.is (now - yesterday, 1, "today - yesterday == 1");
+    t.is (now - yesterday, 86400, "today - yesterday == 1");
 
     t.is (happyNewYear.toString (), "1/1/2008", "toString 1/1/2008");
 

test/feature.1013.t

@@ -61,7 +61,7 @@ like ($stderr, qr/^Configuration override rc.debug:on$/ms, 'Footnotes are sent t
 
 # Check that debugs are sent to standard error
 $stdout = qx{../src/task rc:outerr.rc rc.debug:on list 2> /dev/null};
-unlike ($stdout, qr/^Perf task /ms, 'Debugs are not sent to stdout');
+unlike ($stdout, qr/^Timer Config::load \(outerr.rc\) /ms, 'Debugs are not sent to stdout');
 $stderr = qx{../src/task rc:outerr.rc rc.debug:on list 2>&1 >/dev/null};
 like ($stderr, qr/^Timer Config::load \(outerr.rc\) /ms, 'Debugs are sent to stderr');