From b6467eaa643c61b4424960c54287d31d3a4f0427 Mon Sep 17 00:00:00 2001
From: Jared Cordasco <jcordasc@coglib.com>
Date: Tue, 12 Jan 2010 14:42:02 -0500
Subject: [PATCH] Updated _list() output to match updated addto. Adjusted tests
 to match.

- _list() now shows the capitalized filename in place of 'TODO:'.
  For example, listing garden.txt produces a output prefixed by 'GARDEN:'
  This eliminates the ' from $FILE' part of the _list() output. All tests
  were adjusted to match this new output.
---
 tests/t0001-null.sh              |  4 ++--
 tests/t1000-addlist.sh           | 12 +++++-----
 tests/t1010-add-date.sh          |  8 +++----
 tests/t1020-addtolistfile.sh     | 12 +++++-----
 tests/t1030-addto-date.sh        |  8 +++----
 tests/t1100-replace.sh           |  4 ++--
 tests/t1200-pri.sh               | 14 ++++++------
 tests/t1300-ls.sh                | 38 ++++++++++++++++----------------
 tests/t1400-prepend.sh           |  8 +++----
 tests/t1500-do.sh                |  6 ++---
 tests/t1600-append.sh            |  4 ++--
 tests/t9999-testsuite_example.sh | 26 +++++++++++-----------
 todo.sh                          |  4 +++-
 13 files changed, 75 insertions(+), 73 deletions(-)

diff --git a/tests/t0001-null.sh b/tests/t0001-null.sh
index acfc01b..f67c92e 100755
--- a/tests/t0001-null.sh
+++ b/tests/t0001-null.sh
@@ -12,7 +12,7 @@ when there are no todos.
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown from $HOME/todo.txt
+TODO: 0 of 0 tasks shown
 EOF
 
 test_expect_success 'null ls' '
@@ -44,7 +44,7 @@ test_expect_success 'null listpri a' '
 #
 cat > expect <<EOF
 --
-TODO: 0 of 0 tasks shown from $HOME/todo.tmp
+TODO: 0 of 0 tasks shown
 EOF
 
 test_expect_success 'null lsa' '
diff --git a/tests/t1000-addlist.sh b/tests/t1000-addlist.sh
index 9cabdf5..f881f8b 100755
--- a/tests/t1000-addlist.sh
+++ b/tests/t1000-addlist.sh
@@ -17,7 +17,7 @@ TODO: 'notice the daisies' added on line 1.
 >>> todo.sh list
 1 notice the daisies
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 
 >>> todo.sh add smell the roses
 TODO: 'smell the roses' added on line 2.
@@ -26,7 +26,7 @@ TODO: 'smell the roses' added on line 2.
 1 notice the daisies
 2 smell the roses
 --
-TODO: 2 of 2 tasks shown from $HOME/todo.txt
+TODO: 2 of 2 tasks shown
 EOF
 
 #
@@ -36,12 +36,12 @@ test_todo_session 'basic list filtering' <<EOF
 >>> todo.sh list daisies
 1 notice the daisies
 --
-TODO: 1 of 2 tasks shown from $HOME/todo.txt
+TODO: 1 of 2 tasks shown
 
 >>> todo.sh list smell
 2 smell the roses
 --
-TODO: 1 of 2 tasks shown from $HOME/todo.txt
+TODO: 1 of 2 tasks shown
 EOF
 
 test_todo_session 'case-insensitive filtering' <<EOF
@@ -52,7 +52,7 @@ TODO: 'smell the uppercase Roses' added on line 3.
 2 smell the roses
 3 smell the uppercase Roses
 --
-TODO: 2 of 3 tasks shown from $HOME/todo.txt
+TODO: 2 of 3 tasks shown
 EOF
 
 test_todo_session 'add with &' <<EOF
@@ -65,7 +65,7 @@ TODO: 'dig the garden & water the flowers' added on line 4.
 2 smell the roses
 3 smell the uppercase Roses
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 
 EOF
 
diff --git a/tests/t1010-add-date.sh b/tests/t1010-add-date.sh
index 910ba51..50629ca 100755
--- a/tests/t1010-add-date.sh
+++ b/tests/t1010-add-date.sh
@@ -17,7 +17,7 @@ TODO: '2009-02-13 notice the daisies' added on line 1.
 >>> todo.sh list
 1 2009-02-13 notice the daisies
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 test_tick
@@ -30,7 +30,7 @@ TODO: '2009-02-14 smell the roses' added on line 2.
 1 2009-02-13 notice the daisies
 2 2009-02-14 smell the roses
 --
-TODO: 2 of 2 tasks shown from $HOME/todo.txt
+TODO: 2 of 2 tasks shown
 EOF
 
 test_tick
@@ -44,7 +44,7 @@ TODO: '2009-02-15 mow the lawn' added on line 3.
 2 2009-02-14 smell the roses
 3 2009-02-15 mow the lawn
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 # Switch to config file
@@ -63,7 +63,7 @@ TODO: '2009-02-15 take out the trash' added on line 4.
 3 2009-02-15 mow the lawn
 4 2009-02-15 take out the trash
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 EOF
 
 test_done
diff --git a/tests/t1020-addtolistfile.sh b/tests/t1020-addtolistfile.sh
index 16e09de..760a8f5 100755
--- a/tests/t1020-addtolistfile.sh
+++ b/tests/t1020-addtolistfile.sh
@@ -24,7 +24,7 @@ GARDEN: 'notice the daisies' added on line 1.
 >>> todo.sh listfile garden.txt
 1 notice the daisies
 --
-TODO: 1 of 1 tasks shown from garden.txt
+GARDEN: 1 of 1 tasks shown
 
 >>> todo.sh addto garden.txt smell the roses
 GARDEN: 'smell the roses' added on line 2.
@@ -33,7 +33,7 @@ GARDEN: 'smell the roses' added on line 2.
 1 notice the daisies
 2 smell the roses
 --
-TODO: 2 of 2 tasks shown from garden.txt
+GARDEN: 2 of 2 tasks shown
 EOF
 
 #
@@ -43,12 +43,12 @@ test_todo_session 'basic listfile filtering' <<EOF
 >>> todo.sh listfile garden.txt daisies
 1 notice the daisies
 --
-TODO: 1 of 2 tasks shown from garden.txt
+GARDEN: 1 of 2 tasks shown
 
 >>> todo.sh listfile garden.txt smell  
 2 smell the roses
 --
-TODO: 1 of 2 tasks shown from garden.txt
+GARDEN: 1 of 2 tasks shown
 EOF
 
 test_todo_session 'case-insensitive filtering' <<EOF
@@ -59,7 +59,7 @@ GARDEN: 'smell the uppercase Roses' added on line 3.
 2 smell the roses
 3 smell the uppercase Roses
 --
-TODO: 2 of 3 tasks shown from garden.txt
+GARDEN: 2 of 3 tasks shown
 EOF
 
 test_todo_session 'addto with &' <<EOF
@@ -72,7 +72,7 @@ GARDEN: 'dig the garden & water the flowers' added on line 4.
 2 smell the roses
 3 smell the uppercase Roses
 --
-TODO: 4 of 4 tasks shown from garden.txt
+GARDEN: 4 of 4 tasks shown
 EOF
 
 test_done
diff --git a/tests/t1030-addto-date.sh b/tests/t1030-addto-date.sh
index f4d908c..8f05aa4 100755
--- a/tests/t1030-addto-date.sh
+++ b/tests/t1030-addto-date.sh
@@ -19,7 +19,7 @@ GARDEN: '2009-02-13 notice the daisies' added on line 1.
 >>> todo.sh listfile garden.txt
 1 2009-02-13 notice the daisies
 --
-TODO: 1 of 1 tasks shown from garden.txt
+GARDEN: 1 of 1 tasks shown
 EOF
 
 test_tick
@@ -32,7 +32,7 @@ GARDEN: '2009-02-14 smell the roses' added on line 2.
 1 2009-02-13 notice the daisies
 2 2009-02-14 smell the roses
 --
-TODO: 2 of 2 tasks shown from garden.txt
+GARDEN: 2 of 2 tasks shown
 EOF
 
 test_tick
@@ -46,7 +46,7 @@ GARDEN: '2009-02-15 mow the lawn' added on line 3.
 2 2009-02-14 smell the roses
 3 2009-02-15 mow the lawn
 --
-TODO: 3 of 3 tasks shown from garden.txt
+GARDEN: 3 of 3 tasks shown
 EOF
 
 # Switch to config file
@@ -65,7 +65,7 @@ GARDEN: '2009-02-15 take out the trash' added on line 4.
 3 2009-02-15 mow the lawn
 4 2009-02-15 take out the trash
 --
-TODO: 4 of 4 tasks shown from garden.txt
+GARDEN: 4 of 4 tasks shown
 EOF
 
 test_done
diff --git a/tests/t1100-replace.sh b/tests/t1100-replace.sh
index e1cee69..caf00b3 100755
--- a/tests/t1100-replace.sh
+++ b/tests/t1100-replace.sh
@@ -26,7 +26,7 @@ replaced with
 >>> todo.sh list
 1 smell the cows
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 
 >>> todo.sh replace 1 smell the roses
 1: smell the cows
@@ -36,7 +36,7 @@ replaced with
 >>> todo.sh list
 1 smell the roses
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 cat > todo.txt <<EOF
diff --git a/tests/t1200-pri.sh b/tests/t1200-pri.sh
index c8a7c48..4326470 100755
--- a/tests/t1200-pri.sh
+++ b/tests/t1200-pri.sh
@@ -22,7 +22,7 @@ test_todo_session 'basic priority' <<EOF
 1 smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 1 B
 1: (B) smell the uppercase Roses +flowers @outside
@@ -33,14 +33,14 @@ TODO: 1 prioritized (B).
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 C
 2: (C) notice the sunflowers
@@ -51,7 +51,7 @@ TODO: 2 prioritized (C).
 2 (C) notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 A
 2: (A) notice the sunflowers
@@ -62,7 +62,7 @@ TODO: 2 prioritized (A).
 1 (B) smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh pri 2 a
 2: (A) notice the sunflowers
@@ -72,7 +72,7 @@ TODO: 2 prioritized (A).
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 2 of 3 tasks shown from $HOME/todo.txt
+TODO: 2 of 3 tasks shown
 
 >>> todo.sh add "smell the coffee +wakeup"
 TODO: 'smell the coffee +wakeup' added on line 4.
@@ -83,7 +83,7 @@ TODO: 'smell the coffee +wakeup' added on line 4.
 4 smell the coffee +wakeup
 3 stop
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 EOF
 
 test_done
diff --git a/tests/t1300-ls.sh b/tests/t1300-ls.sh
index e279e74..fb47438 100755
--- a/tests/t1300-ls.sh
+++ b/tests/t1300-ls.sh
@@ -28,14 +28,14 @@ test_todo_session 'checking TODOTXT_SORT_COMMAND' <<EOF
 3 bbb yyy this line should be second.
 1 ccc xxx this line should be third.
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh -d "$TEST_TODO1_" ls
 1 ccc xxx this line should be third.
 3 bbb yyy this line should be second.
 2 aaa zzz this line should be first.
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 #
@@ -50,7 +50,7 @@ test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
 3 bbb yyy this line s...
 1 ccc xxx this line s...
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 #
@@ -70,14 +70,14 @@ test_todo_session 'final filter suppression' <<EOF
 3 baz
 1 foo
 --
-TODO: 2 of 3 tasks shown from $HOME/todo.txt
+TODO: 2 of 3 tasks shown
 
 >>> todo.sh -d "$TEST_TODO3_" -x ls
 2 bar xxx
 3 baz
 1 foo
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 #
@@ -128,7 +128,7 @@ test_todo_session 'plain mode option' <<EOF
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 
 >>> todo.sh -p ls
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -152,7 +152,7 @@ TODO: 20 of 20 tasks shown from $HOME/todo.txt
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 EOF
 
 #
@@ -203,7 +203,7 @@ test_todo_session 'context, project, and priority suppression' <<EOF
 19 @con02 +prj03 -- Some project 03 task, no priorty
 20 @con02 +prj04 -- Some project 04 task, no priority
 --
-TODO: 20 of 20 tasks shown from $HOME/todo.txt
+TODO: 20 of 20 tasks shown
 
 >>> todo.sh ls @con01
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -217,7 +217,7 @@ TODO: 20 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P ls @con01
 01 @con01 +prj01 -- Some project 01 task, pri A
@@ -231,7 +231,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -+ ls @con01
 01 (A) @con01 -- Some project 01 task, pri A
@@ -245,7 +245,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 -- Some project 01 task, no priority
 18 @con01 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -@ ls @con01
 01 (A) +prj01 -- Some project 01 task, pri A
@@ -259,7 +259,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 +prj01 -- Some project 01 task, no priority
 18 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ ls @con01
 01 +prj01 -- Some project 01 task, pri A
@@ -273,7 +273,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 +prj01 -- Some project 01 task, no priority
 18 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ -+ -P -@ -+ ls @con01
 01 (A) @con01 +prj01 -- Some project 01 task, pri A
@@ -287,7 +287,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 @con01 +prj01 -- Some project 01 task, no priority
 18 @con01 +prj02 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 
 >>> todo.sh -P -@ -+ -P -@ -+ -P -@ -+ ls @con01
 01 -- Some project 01 task, pri A
@@ -301,7 +301,7 @@ TODO: 10 of 20 tasks shown from $HOME/todo.txt
 17 -- Some project 01 task, no priority
 18 -- Some project 02 task, no priority
 --
-TODO: 10 of 20 tasks shown from $HOME/todo.txt
+TODO: 10 of 20 tasks shown
 EOF
 
 #
@@ -536,7 +536,7 @@ test_todo_session 'check line number padding, out to 3 digits' <<EOF
 111 hex6E this is another line
 112 hex6F this is another line
 --
-TODO: 112 of 112 tasks shown from $HOME/todo.txt
+TODO: 112 of 112 tasks shown
 EOF
 
 #
@@ -564,7 +564,7 @@ test_todo_session 'check that blank lines are ignored for less than 10 items' <<
 7 hex06 this is another line
 8 hex07 this is another line
 --
-TODO: 7 of 7 tasks shown from $HOME/todo.txt
+TODO: 7 of 7 tasks shown
 EOF
 
 # More than 10
@@ -592,7 +592,7 @@ test_todo_session 'check that blank lines are ignored for blank lines whose ID b
 09 hex08 this is another line
 10 hex09 this is another line
 --
-TODO: 9 of 9 tasks shown from $HOME/todo.txt
+TODO: 9 of 9 tasks shown
 EOF
 cat > todo.txt <<EOF
 hex00 this is one line
@@ -617,7 +617,7 @@ test_todo_session 'check that blank lines are ignored for blank lines whose ID b
 09 hex08 this is another line
 10 hex09 this is another line
 --
-TODO: 8 of 8 tasks shown from $HOME/todo.txt
+TODO: 8 of 8 tasks shown
 EOF
 
 test_done
diff --git a/tests/t1400-prepend.sh b/tests/t1400-prepend.sh
index eaac618..5a19c0b 100755
--- a/tests/t1400-prepend.sh
+++ b/tests/t1400-prepend.sh
@@ -21,14 +21,14 @@ test_todo_session 'basic prepend' <<EOF
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh -p list
 1 (B) smell the uppercase Roses +flowers @outside
 2 notice the sunflowers
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh prepend 2 test
 2: test notice the sunflowers
@@ -38,7 +38,7 @@ TODO: 3 of 3 tasks shown from $HOME/todo.txt
 3 stop
 2 test notice the sunflowers
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 >>> todo.sh prepend 1 test
 1: (B) test smell the uppercase Roses +flowers @outside
@@ -48,7 +48,7 @@ TODO: 3 of 3 tasks shown from $HOME/todo.txt
 3 stop
 2 test notice the sunflowers
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 
 EOF
 
diff --git a/tests/t1500-do.sh b/tests/t1500-do.sh
index 8d0ba0a..0ae79ca 100755
--- a/tests/t1500-do.sh
+++ b/tests/t1500-do.sh
@@ -32,7 +32,7 @@ test_todo_session 'basic do' <<EOF
 1 smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 7 of 7 tasks shown from $HOME/todo.txt
+TODO: 7 of 7 tasks shown
 
 >>> todo.sh do 7,6
 7: x 2009-02-13 remove4
@@ -50,7 +50,7 @@ TODO: $HOME/todo.txt archived.
 1 smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh do 5 4
 5: x 2009-02-13 remove2
@@ -66,7 +66,7 @@ TODO: $HOME/todo.txt archived.
 1 smell the uppercase Roses +flowers @outside
 3 stop
 --
-TODO: 3 of 3 tasks shown from $HOME/todo.txt
+TODO: 3 of 3 tasks shown
 EOF
 
 test_todo_session 'fail multiple do attempts' <<EOF
diff --git a/tests/t1600-append.sh b/tests/t1600-append.sh
index 54feaee..c56bd79 100755
--- a/tests/t1600-append.sh
+++ b/tests/t1600-append.sh
@@ -24,7 +24,7 @@ test_todo_session 'basic append' <<EOF
 >>> todo.sh list
 1 notice the daisies smell the roses
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 test_todo_session 'basic append with &' <<EOF
@@ -34,7 +34,7 @@ test_todo_session 'basic append with &' <<EOF
 >>> todo.sh list
 1 notice the daisies smell the roses see the wasps & bees
 --
-TODO: 1 of 1 tasks shown from $HOME/todo.txt
+TODO: 1 of 1 tasks shown
 EOF
 
 
diff --git a/tests/t9999-testsuite_example.sh b/tests/t9999-testsuite_example.sh
index 03c7353..620a492 100755
--- a/tests/t9999-testsuite_example.sh
+++ b/tests/t9999-testsuite_example.sh
@@ -17,23 +17,23 @@ test_todo_session 'basic tests' <<EOF
 4 smell the coffee +wakeup
 3 stop
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 
 >>> todo.sh -p list +flowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 1 of 4 tasks shown from $HOME/todo.txt
+TODO: 1 of 4 tasks shown
 
 >>> todo.sh -p list flowers
 2 (A) notice the sunflowers
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 2 of 4 tasks shown from $HOME/todo.txt
+TODO: 2 of 4 tasks shown
 
 >>> todo.sh -p list flowers out
 1 (B) smell the uppercase Roses +flowers @outside
 --
-TODO: 1 of 4 tasks shown from $HOME/todo.txt
+TODO: 1 of 4 tasks shown
 
 >>> todo.sh -a do 2
 2: x 2009-02-13 notice the sunflowers
@@ -45,7 +45,7 @@ TODO: 2 marked as done.
 3 stop
 2 x 2009-02-13 notice the sunflowers
 --
-TODO: 4 of 4 tasks shown from $HOME/todo.txt
+TODO: 4 of 4 tasks shown
 
 >>> todo.sh add "make the coffee +wakeup"
 TODO: 'make the coffee +wakeup' added on line 5.
@@ -54,7 +54,7 @@ TODO: 'make the coffee +wakeup' added on line 5.
 5 make the coffee +wakeup
 4 smell the coffee +wakeup
 --
-TODO: 2 of 5 tasks shown from $HOME/todo.txt
+TODO: 2 of 5 tasks shown
 
 >>> todo.sh add "visit http://example.com"
 TODO: 'visit http://example.com' added on line 6.
@@ -67,7 +67,7 @@ TODO: 'visit http://example.com' added on line 6.
 6 visit http://example.com
 2 x 2009-02-13 notice the sunflowers
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh archive
 x 2009-02-13 notice the sunflowers
@@ -80,7 +80,7 @@ TODO: $HOME/todo.txt archived.
 2 stop
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh report
 TODO: Report file updated.
@@ -105,7 +105,7 @@ usage: todo.sh append ITEM# "TEXT TO APPEND"
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh append 10 "hej!"
 10: No such todo.
@@ -118,7 +118,7 @@ TODO: 5 of 5 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh do 10
 10: No such todo.
@@ -131,7 +131,7 @@ TODO: 5 of 5 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 5 of 5 tasks shown from $HOME/todo.txt
+TODO: 5 of 5 tasks shown
 
 >>> todo.sh add "the coffee +wakeup"
 TODO: 'the coffee +wakeup' added on line 6.
@@ -144,7 +144,7 @@ TODO: 'the coffee +wakeup' added on line 6.
 6 the coffee +wakeup
 5 visit http://example.com
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh prepend 6 "make"
 6: make the coffee +wakeup
@@ -157,7 +157,7 @@ TODO: 6 of 6 tasks shown from $HOME/todo.txt
 2 stop and think
 5 visit http://example.com
 --
-TODO: 6 of 6 tasks shown from $HOME/todo.txt
+TODO: 6 of 6 tasks shown
 
 >>> todo.sh remdup
 Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
diff --git a/todo.sh b/todo.sh
index 8a45b05..9164a2a 100755
--- a/todo.sh
+++ b/todo.sh
@@ -590,11 +590,13 @@ _list() {
     echo -ne "$filtered_items${filtered_items:+\n}"
 
     if [ $TODOTXT_VERBOSE -gt 0 ]; then
+        BASE=$(basename "$FILE")
+        PREFIX=$(echo ${BASE%%.[^.]*} | tr [a-z] [A-Z])
         NUMTASKS=$( echo -ne "$filtered_items" | sed -n '$ =' )
         TOTALTASKS=$( echo -ne "$items" | sed -n '$ =' )
 
         echo "--"
-        echo "TODO: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown from $FILE"
+        echo "${PREFIX}: ${NUMTASKS:-0} of ${TOTALTASKS:-0} tasks shown"
     fi
     if [ $TODOTXT_VERBOSE -gt 1 ]
     then