Deprecated Feature Removal

- Removed deprecated 'echo.command' setting, in favor of the 'header' and
  'affected' verbosity tokens.

ChangeLog

@@ -1,3 +1,11 @@
+2.4.0 () -
+
+Features
+ + Removed deprecated 'echo.command' setting, in favor of the 'header' and
+   'affected' verbosity tokens.
+
+Bugs
+
 ------ current release ---------------------------
 
 2.3.0 () -

doc/man/taskrc.5.in

@@ -284,12 +284,6 @@ confirmation before deleting a task, performing bulk changes, or the undo
 command.  The default value is "yes".  Consider leaving this setting as "yes",
 for safety.
 
-.TP
-.B echo.command=yes
-May be "yes" or "no", and causes the display of the ID and description of any
-task when you run the start, stop, do, undo or delete commands. The default
-value is "yes".  Deprecated - use verbosity tokens 'header' and  'affected'.
-
 .TP
 .B indent.annotation=2
 Controls the number of spaces to indent annotations when shown beneath the

src/commands/CmdLog.cpp

@@ -67,8 +67,7 @@ int CmdLog::execute (std::string& output)
     context.footnote (onProjectChange (task));
   context.tdb2.commit ();
 
-  if (context.verbose ("affected") ||
+  if (context.verbose ("affected"))
-      context.config.getBoolean ("echo.command")) // Deprecated 2.0
     output = std::string (STRING_CMD_LOG_LOGGED) + "\n";
 
   return rc;

src/commands/CmdShow.cpp

@@ -146,7 +146,6 @@ int CmdShow::execute (std::string& output)
     " displayweeknumber"
     " dom"
     " due"
-    " echo.command"                      // Deprecated 2.0
     " edit.verbose"                      // Deprecated 2.0
     " editor"
     " exit.on.missing.db"

src/feedback.cpp

@@ -314,11 +314,8 @@ std::string renderAttribute (const std::string& name, const std::string& value,
 //    <string>
 void feedback_affected (const std::string& effect)
 {
-  if (context.verbose ("affected") ||
+  if (context.verbose ("affected"))
-      context.config.getBoolean ("echo.command")) // Deprecated 2.0
-  {
     std::cout << effect << "\n";
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -329,12 +326,9 @@ void feedback_affected (const std::string& effect)
 //    {1}    Quantity
 void feedback_affected (const std::string& effect, int quantity)
 {
-  if (context.verbose ("affected") ||
+  if (context.verbose ("affected"))
-      context.config.getBoolean ("echo.command")) // Deprecated 2.0
-  {
     std::cout << format (effect, quantity)
               << "\n";
-  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -346,8 +340,7 @@ void feedback_affected (const std::string& effect, int quantity)
 //    {2}    Description
 void feedback_affected (const std::string& effect, const Task& task)
 {
-  if (context.verbose ("affected") ||
+  if (context.verbose ("affected"))
-      context.config.getBoolean ("echo.command")) // Deprecated 2.0
   {
     if (task.id)
       std::cout << format (effect, task.id, task.get ("description"))
@@ -392,8 +385,7 @@ void feedback_special_tags (const Task& task, const std::string& tag)
 //    Unblocked <id> '<description>'
 void feedback_unblocked (const Task& task)
 {
-  if (context.verbose ("affected") ||
+  if (context.verbose ("affected"))
-      context.config.getBoolean ("echo.command")) // Deprecated 2.0
   {
     // Get a list of tasks that depended on this task.
     std::vector <Task> blocked;

src/legacy.cpp

@@ -148,8 +148,7 @@ std::string legacyCheckForDeprecatedVariables ()
         it->first.substr (it->first.length () - 12) == ".annotations")
       deprecated.push_back (it->first);
 
-    if (it->first == "echo.command"      ||
+    if (it->first == "edit.verbose"      ||
-        it->first == "edit.verbose"      ||
         it->first == "next"              ||
         it->first == "annotations"       ||
         it->first == "export.ical.class")

test/delete.t

@@ -34,8 +34,7 @@ use Test::More tests => 16;
 if (open my $fh, '>', 'delete.rc')
 {
   print $fh "data.location=.\n",
-            "confirmation=no\n",
+            "confirmation=no\n";
-            "echo.command=no\n";
   close $fh;
   ok (-r 'delete.rc', 'Created delete.rc');
 }

test/undo.t

@@ -34,7 +34,6 @@ use Test::More tests => 11;
 if (open my $fh, '>', 'undo.rc')
 {
   print $fh "data.location=.\n",
-            "echo.command=no\n",
             "confirmation=no\n";
   close $fh;
   ok (-r 'undo.rc', 'Created undo.rc');

test/verbose.t

@@ -34,8 +34,7 @@ use Test::More tests => 8;
 if (open my $fh, '>', 'verbose.rc')
 {
   print $fh "data.location=.\n",
-            "echo.command=off\n";
+            "print.empty.columns=yes\n";
-  print $fh "print.empty.columns=yes\n";
   close $fh;
   ok (-r 'verbose.rc', 'Created verbose.rc');
 }