From 1668aef66b16aa704aee7863de18bae3dadbfa6d Mon Sep 17 00:00:00 2001
From: Louis-Claude Canon <louis-claude.canon@inria.fr>
Date: Tue, 3 Jul 2012 09:50:19 +0200
Subject: [PATCH] Code Cleanup

- Consistent scheme for printing project change information: always
  shows the progress estimation and add a notification that the project
  has changed if the number of tasks is changed.
---
 src/commands/CmdAnnotate.cpp  | 2 +-
 src/commands/CmdAppend.cpp    | 2 +-
 src/commands/CmdDelete.cpp    | 2 +-
 src/commands/CmdDenotate.cpp  | 2 ++
 src/commands/CmdDone.cpp      | 2 +-
 src/commands/CmdDuplicate.cpp | 2 +-
 src/commands/CmdPrepend.cpp   | 2 +-
 src/feedback.cpp              | 2 +-
 8 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/commands/CmdAnnotate.cpp b/src/commands/CmdAnnotate.cpp
index 6e01212d2..2393d2149 100644
--- a/src/commands/CmdAnnotate.cpp
+++ b/src/commands/CmdAnnotate.cpp
@@ -85,7 +85,7 @@ int CmdAnnotate::execute (std::string& output)
       ++count;
       feedback_affected (STRING_CMD_ANNO_TASK, *task);
       if (context.verbose ("project"))
-        context.footnote (onProjectChange (*task, true));
+        context.footnote (onProjectChange (*task, false));
 
       // Annotate siblings.
       if (task->has ("parent"))
diff --git a/src/commands/CmdAppend.cpp b/src/commands/CmdAppend.cpp
index c081a9b8f..25d52ff31 100644
--- a/src/commands/CmdAppend.cpp
+++ b/src/commands/CmdAppend.cpp
@@ -88,7 +88,7 @@ int CmdAppend::execute (std::string& output)
       ++count;
       feedback_affected (STRING_CMD_APPEND_TASK, *task);
       if (context.verbose ("project"))
-        projectChanges[task->get ("project")] = onProjectChange (*task, true);
+        projectChanges[task->get ("project")] = onProjectChange (*task, false);
 
       // Append to siblings.
       if (task->has ("parent"))
diff --git a/src/commands/CmdDelete.cpp b/src/commands/CmdDelete.cpp
index b3289d6ef..1804608a1 100644
--- a/src/commands/CmdDelete.cpp
+++ b/src/commands/CmdDelete.cpp
@@ -103,7 +103,7 @@ int CmdDelete::execute (std::string& output)
         feedback_unblocked (*task);
         dependencyChainOnComplete (*task);
         if (context.verbose ("project"))
-          projectChanges[task->get ("project")] = onProjectChange (*task, true);
+          projectChanges[task->get ("project")] = onProjectChange (*task);
 
         // Delete siblings.
         if (task->has ("parent"))
diff --git a/src/commands/CmdDenotate.cpp b/src/commands/CmdDenotate.cpp
index 8605f2c9c..dcadc934d 100644
--- a/src/commands/CmdDenotate.cpp
+++ b/src/commands/CmdDenotate.cpp
@@ -121,6 +121,8 @@ int CmdDenotate::execute (std::string& output)
         ++count;
         context.tdb2.modify (*task);
         feedback_affected (format (STRING_CMD_DENO_FOUND, anno));
+        if (context.verbose ("project"))
+          context.footnote (onProjectChange (*task, false));
       }
     }
     else
diff --git a/src/commands/CmdDone.cpp b/src/commands/CmdDone.cpp
index 3afeb6f2c..f7fa4d9c2 100644
--- a/src/commands/CmdDone.cpp
+++ b/src/commands/CmdDone.cpp
@@ -104,7 +104,7 @@ int CmdDone::execute (std::string& output)
           nagged = nag (*task);
         dependencyChainOnComplete (*task);
         if (context.verbose ("project"))
-          projectChanges[task->get ("project")] = onProjectChange (*task, false);
+          projectChanges[task->get ("project")] = onProjectChange (*task);
       }
       else
       {
diff --git a/src/commands/CmdDuplicate.cpp b/src/commands/CmdDuplicate.cpp
index 78a354fef..baba55060 100644
--- a/src/commands/CmdDuplicate.cpp
+++ b/src/commands/CmdDuplicate.cpp
@@ -118,7 +118,7 @@ int CmdDuplicate::execute (std::string& output)
         std::cout << format (STRING_CMD_ADD_FEEDBACK, context.tdb2.next_id ()) + "\n";
 
       if (context.verbose ("project"))
-        projectChanges[task->get ("project")] = onProjectChange (*task, false);
+        projectChanges[task->get ("project")] = onProjectChange (*task);
     }
     else
     {
diff --git a/src/commands/CmdPrepend.cpp b/src/commands/CmdPrepend.cpp
index 5c3a523d3..6fbafdd95 100644
--- a/src/commands/CmdPrepend.cpp
+++ b/src/commands/CmdPrepend.cpp
@@ -88,7 +88,7 @@ int CmdPrepend::execute (std::string& output)
       ++count;
       feedback_affected (STRING_CMD_PREPEND_TASK, *task);
       if (context.verbose ("project"))
-        projectChanges[task->get ("project")] = onProjectChange (*task, true);
+        projectChanges[task->get ("project")] = onProjectChange (*task, false);
 
       // Prepend to siblings.
       if (task->has ("parent"))
diff --git a/src/feedback.cpp b/src/feedback.cpp
index b23307281..7a24650bf 100644
--- a/src/feedback.cpp
+++ b/src/feedback.cpp
@@ -459,7 +459,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
 std::string onProjectChange (Task& task1, Task& task2)
 {
   if (task1.get ("project") == task2.get ("project"))
-    return onProjectChange (task1);
+    return onProjectChange (task1, false);
 
   std::string messages1 = onProjectChange (task1);
   std::string messages2 = onProjectChange (task2);