Consistency: Also use /[A-Z]/ instead of /[[:upper:]]/.

Aligning the single outlier with the common usage.

tests/t1200-pri.sh

@@ -53,9 +53,28 @@ TODO: 2 prioritized (C).
 --
 TODO: 3 of 3 tasks shown
 
+>>> todo.sh add "smell the coffee +wakeup"
+4 smell the coffee +wakeup
+TODO: 4 added.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 (C) notice the sunflowers
+4 smell the coffee +wakeup
+3 stop
+--
+TODO: 4 of 4 tasks shown
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(C) notice the sunflowers
+stop
+EOF
+test_todo_session 'reprioritize' <<EOF
 >>> todo.sh pri 2 A
 2 (A) notice the sunflowers
-TODO: 2 prioritized (A).
+TODO: 2 re-prioritized from (C) to (A).
 
 >>> todo.sh -p list
 2 (A) notice the sunflowers
@@ -66,25 +85,12 @@ TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 a
 2 (A) notice the sunflowers
-TODO: 2 prioritized (A).
+TODO: 2 already prioritized (A).
 
 >>> todo.sh -p listpri
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
 TODO: 2 of 3 tasks shown
-
->>> todo.sh add "smell the coffee +wakeup"
-4 smell the coffee +wakeup
-TODO: 4 added.
-
->>> todo.sh -p list
-2 (A) notice the sunflowers
-1 (B) smell the uppercase Roses +flowers @outside
-4 smell the coffee +wakeup
-3 stop
---
-TODO: 4 of 4 tasks shown
 EOF
-
 test_done

tests/t1500-do.sh

@@ -81,6 +81,6 @@ test_todo_session 'fail multiple do attempts' <<EOF
 TODO: 3 marked as done.
 
 >>> todo.sh -a do 3
-3 is already marked done
+TODO: 3 is already marked done.
 EOF
 test_done

todo.sh

@@ -324,8 +324,8 @@ replaceOrPrepend()
   cleaninput $input
 
   # Retrieve existing priority and prepended date
-  priority=$(sed -e "$item!d" -e $item's/^\(([A-Z]) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\1/' "$TODO_FILE")
-  prepdate=$(sed -e "$item!d" -e $item's/^\(([A-Z]) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\2/' "$TODO_FILE")
+  priority=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\1/' "$TODO_FILE")
+  prepdate=$(sed -e "$item!d" -e $item's/^\((.) \)\{0,1\}\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\} \)\{0,1\}.*/\2/' "$TODO_FILE")
 
   if [ "$prepdate" -a "$action" = "replace" ] && [ "$(echo "$input"|sed -e 's/^\([0-9]\{2,4\}-[0-9]\{2\}-[0-9]\{2\}\)\{0,1\}.*/\1/')" ]; then
     # If the replaced text starts with a date, it will replace the existing
@@ -961,7 +961,7 @@ case $action in
                 echo "TODO: $item marked as done."
 	    fi
         else
-            echo "$item is already marked done"
+            echo "TODO: $item is already marked done."
         fi
     done
 
@@ -1020,7 +1020,7 @@ case $action in
         }
     else
         ## No priority specified; show all priority tasks
-        pri="[[:upper:]]"
+        pri="[A-Z]"
     fi
     pri="($pri)"
 
@@ -1086,18 +1086,23 @@ note: PRIORITY must be anywhere from A to Z."
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
     [[ "$newpri" = @([A-Z]) ]] || die "$errmsg"
 
-    sed -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
-
-    if [ "$?" -eq 0 ]; then
-        #it's all good, continue
+    oldpri=$(sed -ne $item's/^(\(.\)) .*/\1/p' "$TODO_FILE")
+    if [ "$oldpri" != "$newpri" ]; then
         sed -i.bak -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE"
-        if [ $TODOTXT_VERBOSE -gt 0 ]; then
-            NEWTODO=$(sed "$item!d" "$TODO_FILE")
-            echo "$item $NEWTODO"
-            echo "TODO: $item prioritized ($newpri)."
-	fi
-    else
-        die "$errmsg"
+    fi
+    if [ $TODOTXT_VERBOSE -gt 0 ]; then
+        NEWTODO=$(sed "$item!d" "$TODO_FILE")
+        echo "$item $NEWTODO"
+        if [ "$oldpri" != "$newpri" ]; then
+            if [ "$oldpri" ]; then
+                echo "TODO: $item re-prioritized from ($oldpri) to ($newpri)."
+            else
+                echo "TODO: $item prioritized ($newpri)."
+            fi
+        fi
+    fi
+    if [ "$oldpri" = "$newpri" ]; then
+        echo "TODO: $item already prioritized ($newpri)."
     fi
     ;;