From 83053fd0c1ec081adc31859f5b9b4c0d13fdae9a Mon Sep 17 00:00:00 2001
From: Ingo Karkat <swdev@ingo-karkat.de>
Date: Wed, 14 Jul 2010 17:18:57 +0200
Subject: [PATCH] Better verbose messages for 'replace' and 'del TERM'.

Added "TODO:" prefix and simplified messages.
---
 tests/t1100-replace.sh   | 24 ++++++++++++------------
 tests/t1800-del.sh       | 10 +++++-----
 tests/t2000-multiline.sh |  2 +-
 todo.sh                  |  4 ++--
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/tests/t1100-replace.sh b/tests/t1100-replace.sh
index a9f489f..bd1570f 100755
--- a/tests/t1100-replace.sh
+++ b/tests/t1100-replace.sh
@@ -20,7 +20,7 @@ EOF
 test_todo_session 'basic replace' <<EOF
 >>> todo.sh replace 1 "smell the cows"
 1: notice the daisies
-replaced with
+TODO: Replaced task with:
 1: smell the cows
 
 >>> todo.sh list
@@ -30,7 +30,7 @@ TODO: 1 of 1 tasks shown
 
 >>> todo.sh replace 1 smell the roses
 1: smell the cows
-replaced with
+TODO: Replaced task with:
 1: smell the roses
 
 >>> todo.sh list
@@ -48,17 +48,17 @@ EOF
 test_todo_session 'replace in multi-item file' <<EOF
 >>> todo.sh replace 1 smell the cheese
 1: smell the cows
-replaced with
+TODO: Replaced task with:
 1: smell the cheese
 
 >>> todo.sh replace 3 jump on hay
 3: thrash some hay
-replaced with
+TODO: Replaced task with:
 3: jump on hay
 
 >>> todo.sh replace 4 collect the eggs
 4: chase the chickens
-replaced with
+TODO: Replaced task with:
 4: collect the eggs
 EOF
 
@@ -69,19 +69,19 @@ TODO: 4 prioritized (A).
 
 >>> todo.sh replace 4 "collect the bread"
 4: (A) collect the eggs
-replaced with
+TODO: Replaced task with:
 4: (A) collect the bread
 
 >>> todo.sh replace 4 collect the eggs
 4: (A) collect the bread
-replaced with
+TODO: Replaced task with:
 4: (A) collect the eggs
 EOF
 
 test_todo_session 'replace with &' << EOF
 >>> todo.sh replace 3 "thrash the hay & thresh the wheat"
 3: jump on hay
-replaced with 
+TODO: Replaced task with:
 3: thrash the hay & thresh the wheat
 EOF
 
@@ -99,12 +99,12 @@ TODO: 1 added.
 
 >>> todo.sh replace 1 this is just a new one
 1: 2009-02-13 new task
-replaced with
+TODO: Replaced task with:
 1: 2009-02-13 this is just a new one
 
 >>> todo.sh replace 1 2010-07-04 this also has a new date
 1: 2009-02-13 this is just a new one
-replaced with
+TODO: Replaced task with:
 1: 2010-07-04 this also has a new date
 EOF
 
@@ -120,14 +120,14 @@ TODO: 1 prioritized (A).
 
 >>> todo.sh replace 1 this is just a new one
 1: (A) 2009-02-13 new task
-replaced with
+TODO: Replaced task with:
 1: (A) 2009-02-13 this is just a new one
 EOF
 
 test_todo_session 'replace with prepended date replaces existing date' <<EOF
 >>> todo.sh replace 1 2010-07-04 this also has a new date
 1: (A) 2009-02-13 this is just a new one
-replaced with
+TODO: Replaced task with:
 1: (A) 2010-07-04 this also has a new date
 EOF
 
diff --git a/tests/t1800-del.sh b/tests/t1800-del.sh
index 621fd69..97738f2 100755
--- a/tests/t1800-del.sh
+++ b/tests/t1800-del.sh
@@ -100,7 +100,7 @@ TODO: 3 of 3 tasks shown
 
 >>> todo.sh del 1 uppercase
 1: (B) smell the uppercase Roses +flowers @outside
-got 'uppercase' removed to become
+TODO: Removed 'uppercase' from task.
 1: (B) smell the Roses +flowers @outside
 
 >>> todo.sh -p list
@@ -112,22 +112,22 @@ TODO: 3 of 3 tasks shown
 
 >>> todo.sh del 1 "the Roses"
 1: (B) smell the Roses +flowers @outside
-got 'the Roses' removed to become
+TODO: Removed 'the Roses' from task.
 1: (B) smell +flowers @outside
 
 >>> todo.sh del 1 m
 1: (B) smell +flowers @outside
-got 'm' removed to become
+TODO: Removed 'm' from task.
 1: (B) sell +flowers @outside
 
 >>> todo.sh del 1 @outside
 1: (B) sell +flowers @outside
-got '@outside' removed to become
+TODO: Removed '@outside' from task.
 1: (B) sell +flowers
 
 >>> todo.sh del 1 sell
 1: (B) sell +flowers
-got 'sell' removed to become
+TODO: Removed 'sell' from task.
 1: (B) +flowers
 EOF
 
diff --git a/tests/t2000-multiline.sh b/tests/t2000-multiline.sh
index 3eaf742..97a9fd3 100755
--- a/tests/t2000-multiline.sh
+++ b/tests/t2000-multiline.sh
@@ -7,7 +7,7 @@ test_description='Multi-line functionality'
 ## Replace test
 # Create the expected file
 echo "1: smell the cheese
-replaced with
+TODO: Replaced task with:
 1: eat apples eat oranges drink milk">$HOME/expect.multi
 
 test_expect_success 'multiline squash item replace' '
diff --git a/todo.sh b/todo.sh
index c7ac715..d72d4e8 100755
--- a/todo.sh
+++ b/todo.sh
@@ -333,7 +333,7 @@ replaceOrPrepend()
     case "$action" in
       replace)
         echo "$item: $todo"
-        echo "replaced with"
+        echo "TODO: Replaced task with:"
         echo "$item: $newtodo"
         ;;
       prepend)
@@ -817,7 +817,7 @@ case $action in
         fi
         if [ $TODOTXT_VERBOSE -gt 0 ]; then
             echo "$item: $DELETEME"
-            echo "got '$3' removed to become"
+            echo "TODO: Removed '$3' from task."
             echo "$item: $newtodo"
         fi
     fi