From 9ada2f554ae108813df83c7ebc97b5aa78482a93 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Sun, 11 Sep 2011 13:49:07 -0400
Subject: [PATCH] Bug

- The modify command no longer claims that a task was modified if no
  changes were applied.
---
 src/TDB2.cpp               | 43 ++++++++++++++++++++------------------
 src/Task.cpp               |  5 +----
 src/commands/CmdModify.cpp |  3 ++-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/src/TDB2.cpp b/src/TDB2.cpp
index 786cdcef9..66548b0a2 100644
--- a/src/TDB2.cpp
+++ b/src/TDB2.cpp
@@ -551,29 +551,32 @@ void TDB2::modify (Task& task)
   Task original;
   get (task.get ("uuid"), original);
 
-  std::string status = original.get ("status");
-  if (status == "pending" ||
-      status == "waiting" ||
-      status == "recurring")
+  if (taskDiff (original, task))
   {
-    pending.modify_task (task);
-  }
-  else
-  {
-    completed.modify_task (task);
-  }
+    std::string status = original.get ("status");
+    if (status == "pending" ||
+        status == "waiting" ||
+        status == "recurring")
+    {
+      pending.modify_task (task);
+    }
+    else
+    {
+      completed.modify_task (task);
+    }
 
-  // time <time>
-  // old <task>
-  // new <task>
-  // ---
-  undo.add_line ("time " + Date ().toEpochString () + "\n");
-  undo.add_line ("old " + original.composeF4 ());
-  undo.add_line ("new " + task.composeF4 ());
-  undo.add_line ("---\n");
+    // time <time>
+    // old <task>
+    // new <task>
+    // ---
+    undo.add_line ("time " + Date ().toEpochString () + "\n");
+    undo.add_line ("old " + original.composeF4 ());
+    undo.add_line ("new " + task.composeF4 ());
+    undo.add_line ("---\n");
 
-  // Add modified task to backlog.
-  backlog.add_task (task);
+    // Add modified task to backlog.
+    backlog.add_task (task);
+  }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/Task.cpp b/src/Task.cpp
index 4fff9072a..6e66f0d87 100644
--- a/src/Task.cpp
+++ b/src/Task.cpp
@@ -749,9 +749,8 @@ void Task::removeDependency (const std::string& uuid)
     std::string combined;
     join (combined, ",", deps);
     set ("depends", combined);
+    recalc_urgency = true;
   }
-
-  recalc_urgency = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -762,8 +761,6 @@ void Task::removeDependency (int id)
     removeDependency (uuid);
   else
     throw std::string (STRING_TASK_DEPEND_NO_UUID);
-
-  recalc_urgency = true;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/src/commands/CmdModify.cpp b/src/commands/CmdModify.cpp
index 05c33a507..b6d281337 100644
--- a/src/commands/CmdModify.cpp
+++ b/src/commands/CmdModify.cpp
@@ -78,7 +78,8 @@ int CmdModify::execute (std::string& output)
     Task before (*task);
     modify_task_description_replace (*task, modifications);
 
-    if (permission.confirmed (*task, taskDifferences (before, *task) + "Proceed with change?"))
+    if (taskDiff (before, *task) &&
+        permission.confirmed (*task, taskDifferences (before, *task) + "Proceed with change?"))
     {
       ++count;
       context.tdb2.modify (*task);