From 885bde51f1a0ac2b885df4d662a5a26006e2c077 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Wed, 31 Aug 2011 01:45:31 -0400
Subject: [PATCH] Task Validation

- Cleaned up the 'append' and 'prepend' commands due to the new
  validation.
---
 src/commands/CmdAppend.cpp  | 5 -----
 src/commands/CmdPrepend.cpp | 9 ++-------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index 545bbd161..93f5419be 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -79,7 +79,6 @@ int CmdAppend::execute (std::string& output)
   for (task = filtered.begin (); task != filtered.end (); ++task)
   {
     modify_task_description_append (*task, modifications);
-    apply_defaults (*task);
     ++changes;
     context.tdb2.modify (*task);
 
@@ -91,14 +90,10 @@ int CmdAppend::execute (std::string& output)
 
       // Apply other deltas.
       modify_task_description_append (*sibling, modifications);
-      apply_defaults (*sibling);
       ++changes;
 
       if (taskDiff (before, *sibling))
       {
-        // Only allow valid tasks.
-        sibling->validate ();
-
         if (changes && permission.confirmed (before, taskDifferences (before, *sibling) + "Proceed with change?"))
         {
           context.tdb2.modify (*sibling);
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 2714b2293..05ad1d579 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -79,9 +79,8 @@ int CmdPrepend::execute (std::string& output)
   for (task = filtered.begin (); task != filtered.end (); ++task)
   {
     modify_task_description_prepend (*task, modifications);
-    apply_defaults (*task);
-    ++changes;
     context.tdb2.modify (*task);
+    ++changes;
 
     std::vector <Task> siblings = context.tdb2.siblings (*task);
     std::vector <Task>::iterator sibling;
@@ -91,17 +90,13 @@ int CmdPrepend::execute (std::string& output)
 
       // Apply other deltas.
       modify_task_description_prepend (*sibling, modifications);
-      apply_defaults (*sibling);
-      ++changes;
 
       if (taskDiff (before, *sibling))
       {
-        // Only allow valid tasks.
-        sibling->validate ();
-
         if (changes && permission.confirmed (before, taskDifferences (before, *sibling) + "Proceed with change?"))
         {
           context.tdb2.modify (*sibling);
+          ++changes;
 
           if (context.config.getBoolean ("echo.command"))
             out << format (STRING_CMD_PREPEND_DONE, sibling->id)