Added .gitattributes to allow for git archive use on releases.

Versions of bash before 3.0 do not have =~ syntax to match on a regex.
Changed to using a simple grep -c test instead.
Fixes issues with osx and Solaris 9 and before.

.gitattributes

@@ -0,0 +1,6 @@
+.git[ia]* export-ignore
+GEN-VERSION-FILE export-ignore
+Makefile export-ignore
+README.textile export-ignore
+VERSION-FILE export-ignore
+tests export-ignore

.gitignore

@@ -1 +1,3 @@
 VERSION-FILE
+tests/test-results
+tests/trash\ directory.*

Makefile

@@ -29,6 +29,24 @@ dist: $(DISTFILES) todo.sh
 clean:
 	rm -f $(DISTNAME).tar.gz $(DISTNAME).zip
 
-.PHONY: test
+
-test:
+#
-	@echo "TBD!"
+# Testing
+#
+TESTS = $(wildcard tests/t[0-9][0-9][0-9][0-9]-*.sh)
+#TEST_OPTIONS=--verbose
+
+test-pre-clean:
+	rm -rf tests/test-results "tests/trash directory"*
+
+aggregate-results: $(TESTS)
+
+$(TESTS): test-pre-clean
+	-cd tests && sh $(notdir $@) $(TEST_OPTIONS)
+
+test: aggregate-results
+	tests/aggregate-results.sh tests/test-results/t*-*
+	rm -rf tests/test-results
+    
+# Force tests to get run every time
+.PHONY: test test-pre-clean aggregate-results $(TESTS)

README

@@ -1,8 +0,0 @@
-    TODO.TXT Command Line Interface
-    Latest version: http://github.com/ginatrapani/todo.txt-cli/tree/master
-    First release: 5/11/2006
-    Conceived and released by: Gina Trapani (http://ginatrapani.org)
-    Contributors: http://github.com/ginatrapani/todo.txt-cli/network
-    License: GPL, http://www.gnu.org/copyleft/gpl.html
-    More information and mailing list at http://todotxt.com
-    To submit patches, fork the repository at http://github.com/ginatrapani/todo.txt-cli/tree/master

README.textile

@@ -0,0 +1,26 @@
+h1. TODO.TXT Command Line Interface
+
+A simple and extensible shell script for managing your todo.txt file.
+
+h2. "Downloads":http://github.com/ginatrapani/todo.txt-cli/downloads
+
+"Download the latest stable release":http://github.com/ginatrapani/todo.txt-cli/downloads for use on your desktop or server.
+
+h2. "Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli
+
+* "User Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli/user-documentation - Find out "how to install and use Todo.txt CLI":http://wiki.github.com/ginatrapani/todo.txt-cli/user-documentation, and get tips and tricks.
+
+* "Developer Documentation":http://wiki.github.com/ginatrapani/todo.txt-cli/developer-documentation - "Contribute to Todo.txt CLI":http://wiki.github.com/ginatrapani/todo.txt-cli/developer-documentation and build your own custom add-ons.
+
+h2. "Mailing List":http://groups.yahoo.com/group/todotxt/
+
+Get support from users and developers on the "mailing list":http://groups.yahoo.com/group/todotxt/.
+
+h2. Quick Links
+
+* Original anemic release by "Gina Trapani":http://ginatrapani.org on 5/11/2006.
+* Raised to great heights by "brainy and dedicated volunteers":http://github.com/ginatrapani/todo.txt-cli/network.
+* Licensed under the "GPL":http://www.gnu.org/copyleft/gpl.html
+* "Add-on Directory":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-add-on-directory
+* "Changelog":http://wiki.github.com/ginatrapani/todo.txt-cli/todosh-changelog
+* "Known Bugs":http://github.com/ginatrapani/todo.txt-cli/issues

tests/Makefile

@@ -0,0 +1,2 @@
+test:
+	$(MAKE) -C .. test

tests/README

@@ -0,0 +1,258 @@
+todo.sh tests
+=============
+
+This directory holds test scripts for todo.sh.  The
+first part of this short document describes how to run the tests
+and read their output.
+
+When fixing the tools or adding enhancements, you are strongly
+encouraged to add tests in this directory to cover what you are
+trying to fix or enhance.  The later part of this short document
+describes how your test scripts should be organized.
+
+
+Running Tests
+-------------
+
+The easiest way to run tests is to say "make test" from the top-level.
+This runs all the tests.
+
+    rm -rf tests/test-results "tests/trash directory"*
+    cd tests && sh t0000-config.sh 
+    *   ok 1: no config file
+    *   ok 2: config file (default location 1)
+    *   ok 3: config file (default location 2)
+    *   ok 4: config file (command line)
+    *   ok 5: config file (env variable)
+    * passed all 5 test(s)
+    cd tests && sh t0001-null.sh 
+    *   ok 1: null ls
+    * passed all 1 test(s)
+    rm -rf tests/test-results
+
+Or you can run each test individually from command line, like
+this:
+
+    $ ./t0001-null.sh 
+    *   ok 1: null ls
+    * passed all 1 test(s)
+
+You can pass --verbose (or -v), --debug (or -d), and --immediate
+(or -i) command line argument to the test, or by setting GIT_TEST_OPTS
+appropriately before running "make".
+
+--verbose::
+	This makes the test more verbose.  Specifically, the
+	command being run and their output if any are also
+	output.
+
+--debug::
+	This may help the person who is developing a new test.
+	It causes the command defined with test_debug to run.
+
+--immediate::
+	This causes the test to immediately exit upon the first
+	failed test.
+
+--long-tests::
+	This causes additional long-running tests to be run (where
+	available), for more exhaustive testing.
+
+--tee::
+	In addition to printing the test output to the terminal,
+	write it to files named 't/test-results/$TEST_NAME.out'.
+	As the names depend on the tests' file names, it is safe to
+	run the tests with this option in parallel.
+
+Skipping Tests
+--------------
+
+In some environments, certain tests have no way of succeeding
+due to platform limitation, such as lack of 'unzip' program, or
+filesystem that do not allow arbitrary sequence of non-NUL bytes
+as pathnames.
+
+You should be able to say something like
+
+    $ SKIP_TESTS=t0000.2 sh ./t0000-config.sh
+
+and even:
+
+    $ SKIP_TESTS='t[0-4]??? t91?? t9200.8' make
+
+to omit such tests.  The value of the environment variable is a
+SP separated list of patterns that tells which tests to skip,
+and either can match the "t[0-9]{4}" part to skip the whole
+test, or t[0-9]{4} followed by ".$number" to say which
+particular test to skip.
+
+Note that some tests in the existing test suite rely on previous
+test item, so you cannot arbitrarily disable one and expect the
+remainder of test to check what the test originally was intended
+to check.
+
+
+Naming Tests
+------------
+
+The test files are named as:
+
+	tNNNN-commandname-details.sh
+
+where N is a decimal digit.
+
+First digit tells the family:
+
+	0 - the absolute basics and global stuff
+	1 - basic every-day usage
+	2 - add ins
+
+Second digit tells the particular command we are testing.
+
+Third digit (optionally) tells the particular switch or group of switches
+we are testing.
+
+If you create files under tests/ directory (i.e. here) that is not
+the top-level test script, never name the file to match the above
+pattern.  The Makefile here considers all such files as the
+top-level test script and tries to run all of them.  A care is
+especially needed if you are creating a common test library
+file, similar to test-lib.sh, because such a library file may
+not be suitable for standalone execution.
+
+
+Writing Tests
+-------------
+
+The test script is written as a shell script.  It should start
+with the standard "#!/bin/sh" with copyright notices, and an
+assignment to variable 'test_description', like this:
+
+	#!/bin/sh
+	#
+	# Copyright (c) 2005 Junio C Hamano
+	#
+
+	test_description='xxx test (option --frotz)
+
+	This test registers the following structure in the cache
+	and tries to run git-ls-files with option --frotz.'
+
+
+Source 'test-lib.sh'
+--------------------
+
+After assigning test_description, the test script should source
+test-lib.sh like this:
+
+	. ./test-lib.sh
+
+This test harness library does the following things:
+
+ - If the script is invoked with command line argument --help
+   (or -h), it shows the test_description and exits.
+
+ - Creates an empty test directory with an empty todo file
+   database and chdir(2) into it.  This directory is 't/trash directory'
+   if you must know, but I do not think you care.
+
+ - Defines standard test helper functions for your scripts to
+   use.  These functions are designed to make all scripts behave
+   consistently when command line arguments --verbose (or -v),
+   --debug (or -d), and --immediate (or -i) is given.
+
+
+End with test_done
+------------------
+
+Your script will be a sequence of tests, using helper functions
+from the test harness library.  At the end of the script, call
+'test_done'.
+
+
+Test harness library
+--------------------
+
+There are a handful helper functions defined in the test harness
+library for your script to use.
+
+ - test_todo_session <message> < transcript
+
+   This takes a single string as a parameter, which is treated
+   as a base description of what is being tested, and then
+   reads from standard input a transcript of todo.sh commands
+   and expected output.  Each command is run in the current
+   test environment and the output is compared with the
+   expected output.  (See below for how to generate transcripts
+   easily.)
+
+ - test_tick [interval]
+
+   The test harness has an internal view of time which is
+   implemented by wrapping the date command.  This takes a single
+   optional positive integer parameter which indicates how much
+   to advance the internal time.  The default value is one day.
+
+ - test_expect_success <message> <script>
+
+   This takes two strings as parameter, and evaluates the
+   <script>.  If it yields success, test is considered
+   successful.  <message> should state what it is testing.
+
+   Example:
+
+	test_expect_success \
+	    'git-write-tree should be able to write an empty tree.' \
+	    'tree=$(git-write-tree)'
+
+ - test_expect_failure <message> <script>
+
+   This is NOT the opposite of test_expect_success, but is used
+   to mark a test that demonstrates a known breakage.  Unlike
+   the usual test_expect_success tests, which say "ok" on
+   success and "FAIL" on failure, this will say "FIXED" on
+   success and "still broken" on failure.  Failures from these
+   tests won't cause -i (immediate) to stop.
+
+ - test_debug <script>
+
+   This takes a single argument, <script>, and evaluates it only
+   when the test script is started with --debug command line
+   argument.  This is primarily meant for use during the
+   development of a new test script.
+
+ - test_done
+
+   Your test script must have test_done at the end.  Its purpose
+   is to summarize successes and failures in the test script and
+   exit with an appropriate error code.
+
+
+Generating test transcripts
+---------------------------
+
+You can generate test scripts from screenshots as following:
+
+    $ ./testshell.sh
+
+You'll be in a special test environment with an empty todo.txt
+and the dates and timestamps will be artificially fixed.
+
+Then the session can be used to make a unit test thanks to
+test_todo_session, see the existing tests as examples.
+
+Be careful to replace all occurences of the full path to the test
+directory by $HOME as testshell.sh will explain you when you execute it
+otherwise the tests will work properly only on your own computer.
+
+Don't use "script" as this would log every keystroke, not only what's
+visible!!
+
+
+Credits
+-------
+
+This test framework was derived from the framework used by
+git itself, written originally by Junio Hamano and licensed
+for use under the GPL.  It was specialized for todo.txt-cli
+by Emil Sit and Philippe Teuwen.

tests/aggregate-results.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+
+fixed=0
+success=0
+failed=0
+broken=0
+total=0
+
+for file
+do
+	while read type value
+	do
+		case $type in
+		'')
+			continue ;;
+		fixed)
+			fixed=$(($fixed + $value)) ;;
+		success)
+			success=$(($success + $value)) ;;
+		failed)
+			failed=$(($failed + $value)) ;;
+		broken)
+			broken=$(($broken + $value)) ;;
+		total)
+			total=$(($total + $value)) ;;
+		esac
+	done <"$file"
+done
+
+printf "%-8s%d\n" fixed $fixed
+printf "%-8s%d\n" success $success
+printf "%-8s%d\n" failed $failed
+printf "%-8s%d\n" broken $broken
+printf "%-8s%d\n" total $total

tests/t0000-config.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+
+test_description='todo.sh configuration file location
+
+This test just makes sure that todo.sh can find its
+config files in the default locations and take arguments
+to find it somewhere else.
+'
+. ./test-lib.sh
+
+# Remove the pre-created todo.cfg to test behavior in its absence
+rm -f todo.cfg
+echo "Fatal error: Cannot read configuration file $HOME/.todo/config" > expect
+test_expect_success 'no config file' '
+    todo.sh > output 2>&1 || test_cmp expect output
+'
+
+# All the below tests will output the usage message.
+cat > expect << EOF
+Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+Try 'todo.sh -h' for more information.
+EOF
+
+cat > test.cfg << EOF
+export TODO_DIR=.
+export TODO_FILE="\$TODO_DIR/todo.txt"
+export DONE_FILE="\$TODO_DIR/done.txt"
+export REPORT_FILE="\$TODO_DIR/report.txt"
+export TMP_FILE="\$TODO_DIR/todo.tmp"
+touch used_config
+EOF
+
+rm -f used_config
+test_expect_success 'config file (default location 1)' '
+    mkdir .todo
+    cp test.cfg .todo/config
+    todo.sh > output;
+    test_cmp expect output && test -f used_config &&
+        rm -rf .todo
+'
+
+rm -f used_config
+test_expect_success 'config file (default location 2)' '
+    cp test.cfg todo.cfg
+    todo.sh > output;
+    test_cmp expect output && test -f used_config &&
+        rm -f todo.cfg
+'
+
+rm -f used_config
+test_expect_success 'config file (default location 3)' '
+    cp test.cfg .todo.cfg
+    todo.sh > output;
+    test_cmp expect output && test -f used_config &&
+        rm -f .todo.cfg
+'
+
+rm -f used_config
+test_expect_success 'config file (command line)' '
+    todo.sh -d test.cfg > output;
+    test_cmp expect output && test -f used_config
+'
+
+rm -f used_config
+test_expect_success 'config file (env variable)' '
+    TODOTXT_CFG_FILE=test.cfg todo.sh > output;
+    test_cmp expect output && test -f used_config
+'
+
+test_done

tests/t0001-null.sh

@@ -0,0 +1,101 @@
+#!/bin/sh
+
+test_description='todo.sh basic null functionality test.
+
+This test just makes sure the basic commands work,
+when there are no todos.
+'
+. ./test-lib.sh
+
+#
+# ls|list
+#
+cat > expect <<EOF
+--
+TODO: 0 of 0 tasks shown
+EOF
+
+test_expect_success 'null ls' '
+    todo.sh ls > output && test_cmp expect output
+'
+test_expect_success 'null list' '
+    todo.sh list > output && test_cmp expect output
+'
+test_expect_success 'null list filter' '
+    todo.sh list filter > output && test_cmp expect output
+'
+
+#
+# lsp|listpri
+#
+# Re-use expect from ls.
+test_expect_success 'null lsp' '
+    todo.sh lsp > output && test_cmp expect output
+'
+test_expect_success 'null listpri' '
+    todo.sh listpri > output && test_cmp expect output
+'
+test_expect_success 'null listpri a' '
+    todo.sh listpri a > output && test_cmp expect output
+'
+
+#
+# lsa|listall
+#
+cat > expect <<EOF
+--
+TODO: 0 of 0 tasks shown
+EOF
+
+test_expect_success 'null lsa' '
+    todo.sh lsa > output && test_cmp expect output
+'
+test_expect_success 'null list' '
+    todo.sh listall > output && test_cmp expect output
+'
+test_expect_success 'null list filter' '
+    todo.sh listall filter > output && test_cmp expect output
+'
+
+
+#
+# lsc|listcon
+#
+test_expect_success 'null lsc' '
+    todo.sh lsc > output && ! test -s output
+'
+test_expect_success 'null listcon' '
+    todo.sh listcon > output && ! test -s output
+'
+
+#
+# lsprj|listproj
+#
+test_expect_success 'null lsprj' '
+    todo.sh lsprj > output && ! test -s output
+'
+test_expect_success 'null listproj' '
+    todo.sh listproj > output && ! test -s output
+'
+
+#
+# lf|listfile
+#
+cat > expect <<EOF
+TODO: File  does not exist.
+EOF
+# XXX really should give a better usage error message here.
+test_expect_success 'null lf' '
+    todo.sh lf > output || test_cmp expect output
+'
+test_expect_success 'null listfile' '
+    todo.sh listfile > output || test_cmp expect output
+'
+cat > expect <<EOF
+TODO: File foo.txt does not exist.
+EOF
+test_expect_success 'null listfile foo.txt' '
+    todo.sh listfile foo.txt > output || test_cmp expect output
+'
+
+test_done

tests/t1000-addlist.sh

@@ -0,0 +1,72 @@
+#!/bin/sh
+
+test_description='basic add and list functionality
+
+This test just makes sure the basic add and list
+command work, including support for filtering.
+'
+. ./test-lib.sh
+
+#
+# Add and list
+#
+test_todo_session 'basic add/list' <<EOF
+>>> todo.sh add notice the daisies
+TODO: 'notice the daisies' added on line 1.
+
+>>> todo.sh list
+1 notice the daisies
+--
+TODO: 1 of 1 tasks shown
+
+>>> todo.sh add smell the roses
+TODO: 'smell the roses' added on line 2.
+
+>>> todo.sh list
+1 notice the daisies
+2 smell the roses
+--
+TODO: 2 of 2 tasks shown
+EOF
+
+#
+# Filter
+#
+test_todo_session 'basic list filtering' <<EOF
+>>> todo.sh list daisies
+1 notice the daisies
+--
+TODO: 1 of 2 tasks shown
+
+>>> todo.sh list smell
+2 smell the roses
+--
+TODO: 1 of 2 tasks shown
+EOF
+
+test_todo_session 'case-insensitive filtering' <<EOF
+>>> todo.sh add smell the uppercase Roses
+TODO: 'smell the uppercase Roses' added on line 3.
+
+>>> todo.sh list roses
+2 smell the roses
+3 smell the uppercase Roses
+--
+TODO: 2 of 3 tasks shown
+EOF
+
+test_todo_session 'add with &' <<EOF
+>>> todo.sh add "dig the garden & water the flowers"
+TODO: 'dig the garden & water the flowers' added on line 4.
+
+>>> todo.sh list
+4 dig the garden & water the flowers
+1 notice the daisies
+2 smell the roses
+3 smell the uppercase Roses
+--
+TODO: 4 of 4 tasks shown
+
+EOF
+
+test_done

tests/t1010-add-date.sh

@@ -0,0 +1,69 @@
+#!/bin/sh
+
+test_description='test the date on add feature
+
+Tests paths by which we might automatically add
+a date to each item.
+'
+. ./test-lib.sh
+
+#
+# Add and list
+#
+test_todo_session 'cmd line first day' <<EOF
+>>> todo.sh -t add notice the daisies
+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
+EOF
+
+test_tick
+
+test_todo_session 'cmd line second day' <<EOF
+>>> todo.sh -t add smell the roses
+TODO: '2009-02-14 smell the roses' added on line 2.
+
+>>> todo.sh list
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+--
+TODO: 2 of 2 tasks shown
+EOF
+
+test_tick
+
+test_todo_session 'cmd line third day' <<EOF
+>>> todo.sh -t add mow the lawn
+TODO: '2009-02-15 mow the lawn' added on line 3.
+
+>>> todo.sh list
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+# Switch to config file
+echo "export TODOTXT_DATE_ON_ADD=1" >> todo.cfg
+
+# Bump the clock, for good measure.
+test_tick 3600
+
+test_todo_session 'config file third day' <<EOF
+>>> todo.sh add take out the trash
+TODO: '2009-02-15 take out the trash' added on line 4.
+
+>>> todo.sh list
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+4 2009-02-15 take out the trash
+--
+TODO: 4 of 4 tasks shown
+EOF
+
+test_done

tests/t1020-addtolistfile.sh

@@ -0,0 +1,78 @@
+#!/bin/sh
+
+test_description='basic addto and list functionality
+
+This test just makes sure the basic addto and listfile
+commands work, including support for filtering.
+'
+. ./test-lib.sh
+
+#
+# Addto and listfile
+#
+test_todo_session 'nonexistant file' <<EOF
+>>> todo.sh addto garden.txt notice the daisies
+TODO: Destination file $HOME/garden.txt does not exist.
+EOF
+
+touch "$HOME/garden.txt"
+
+test_todo_session 'basic addto/listfile' <<EOF
+>>> todo.sh addto garden.txt notice the daisies
+GARDEN: 'notice the daisies' added on line 1.
+
+>>> todo.sh listfile garden.txt
+1 notice the daisies
+--
+GARDEN: 1 of 1 tasks shown
+
+>>> todo.sh addto garden.txt smell the roses
+GARDEN: 'smell the roses' added on line 2.
+
+>>> todo.sh listfile garden.txt
+1 notice the daisies
+2 smell the roses
+--
+GARDEN: 2 of 2 tasks shown
+EOF
+
+#
+# Filter
+#
+test_todo_session 'basic listfile filtering' <<EOF
+>>> todo.sh listfile garden.txt daisies
+1 notice the daisies
+--
+GARDEN: 1 of 2 tasks shown
+
+>>> todo.sh listfile garden.txt smell  
+2 smell the roses
+--
+GARDEN: 1 of 2 tasks shown
+EOF
+
+test_todo_session 'case-insensitive filtering' <<EOF
+>>> todo.sh addto garden.txt smell the uppercase Roses
+GARDEN: 'smell the uppercase Roses' added on line 3.
+
+>>> todo.sh listfile garden.txt roses
+2 smell the roses
+3 smell the uppercase Roses
+--
+GARDEN: 2 of 3 tasks shown
+EOF
+
+test_todo_session 'addto with &' <<EOF
+>>> todo.sh addto garden.txt "dig the garden & water the flowers"
+GARDEN: 'dig the garden & water the flowers' added on line 4.
+
+>>> todo.sh listfile garden.txt 
+4 dig the garden & water the flowers
+1 notice the daisies
+2 smell the roses
+3 smell the uppercase Roses
+--
+GARDEN: 4 of 4 tasks shown
+EOF
+
+test_done

tests/t1030-addto-date.sh

@@ -0,0 +1,71 @@
+#!/bin/sh
+
+test_description='test the date on addto feature
+
+Tests paths by which we might automatically add
+a date to each item.
+'
+. ./test-lib.sh
+
+touch "$HOME/garden.txt"
+
+#
+# Add and list
+#
+test_todo_session 'cmd line first day' <<EOF
+>>> todo.sh -t addto garden.txt notice the daisies
+GARDEN: '2009-02-13 notice the daisies' added on line 1.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+--
+GARDEN: 1 of 1 tasks shown
+EOF
+
+test_tick
+
+test_todo_session 'cmd line second day' <<EOF
+>>> todo.sh -t addto garden.txt smell the roses
+GARDEN: '2009-02-14 smell the roses' added on line 2.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+--
+GARDEN: 2 of 2 tasks shown
+EOF
+
+test_tick
+
+test_todo_session 'cmd line third day' <<EOF
+>>> todo.sh -t addto garden.txt mow the lawn
+GARDEN: '2009-02-15 mow the lawn' added on line 3.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+--
+GARDEN: 3 of 3 tasks shown
+EOF
+
+# Switch to config file
+echo "export TODOTXT_DATE_ON_ADD=1" >> todo.cfg
+
+# Bump the clock, for good measure.
+test_tick 3600
+
+test_todo_session 'config file third day' <<EOF
+>>> todo.sh addto garden.txt take out the trash
+GARDEN: '2009-02-15 take out the trash' added on line 4.
+
+>>> todo.sh listfile garden.txt
+1 2009-02-13 notice the daisies
+2 2009-02-14 smell the roses
+3 2009-02-15 mow the lawn
+4 2009-02-15 take out the trash
+--
+GARDEN: 4 of 4 tasks shown
+EOF
+
+test_done

tests/t1100-replace.sh

@@ -0,0 +1,88 @@
+#!/bin/sh
+
+test_description='basic replace functionality
+
+Ensure we can replace items successfully.
+'
+. ./test-lib.sh
+
+#
+# Set up the basic todo.txt
+#
+todo.sh add notice the daisies > /dev/null
+
+test_todo_session 'replace usage' <<EOF
+>>> todo.sh replace adf asdfa
+=== 1
+usage: todo.sh replace ITEM# "UPDATED ITEM"
+EOF
+
+test_todo_session 'basic replace' <<EOF
+>>> todo.sh replace 1 "smell the cows"
+1: notice the daisies
+replaced with
+1: smell the cows
+
+>>> todo.sh list
+1 smell the cows
+--
+TODO: 1 of 1 tasks shown
+
+>>> todo.sh replace 1 smell the roses
+1: smell the cows
+replaced with
+1: smell the roses
+
+>>> todo.sh list
+1 smell the roses
+--
+TODO: 1 of 1 tasks shown
+EOF
+
+cat > todo.txt <<EOF
+smell the cows
+grow some corn
+thrash some hay
+chase the chickens
+EOF
+test_todo_session 'replace in multi-item file' <<EOF
+>>> todo.sh replace 1 smell the cheese
+1: smell the cows
+replaced with
+1: smell the cheese
+
+>>> todo.sh replace 3 jump on hay
+3: thrash some hay
+replaced with
+3: jump on hay
+
+>>> todo.sh replace 4 collect the eggs
+4: chase the chickens
+replaced with
+4: collect the eggs
+EOF
+
+test_todo_session 'replace with priority' <<EOF
+>>> todo.sh pri 4 a
+4: (A) collect the eggs
+TODO: 4 prioritized (A).
+
+>>> todo.sh replace 4 "collect the bread"
+4: (A) collect the eggs
+replaced with
+4: (A) collect the bread
+EOF
+test_todo_session 'replace with &' << EOF
+>>> todo.sh replace 3 "thrash the hay & thresh the wheat"
+3: jump on hay
+replaced with 
+3: thrash the hay & thresh the wheat
+EOF
+
+test_todo_session 'replace error' << EOF
+>>> todo.sh replace 10 "hej!"
+=== 1
+10: No such todo.
+EOF
+
+test_done

tests/t1200-pri.sh

@@ -0,0 +1,89 @@
+#!/bin/sh
+
+test_description='basic priority functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'priority usage' <<EOF
+>>> todo.sh pri B B
+usage: todo.sh pri ITEM# PRIORITY
+note: PRIORITY must be anywhere from A to Z.
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+EOF
+test_todo_session 'basic priority' <<EOF
+>>> todo.sh list
+2 notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh pri 1 B
+1: (B) smell the uppercase Roses +flowers @outside
+TODO: 1 prioritized (B).
+
+>>> todo.sh list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+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
+
+>>> todo.sh pri 2 C
+2: (C) notice the sunflowers
+TODO: 2 prioritized (C).
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+2 (C) notice the sunflowers
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh pri 2 A
+2: (A) notice the sunflowers
+TODO: 2 prioritized (A).
+
+>>> todo.sh -p list
+2 (A) notice the sunflowers
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh pri 2 a
+2: (A) notice the sunflowers
+TODO: 2 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"
+TODO: 'smell the coffee +wakeup' added on line 4.
+
+>>> 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/t1300-ls.sh

@@ -0,0 +1,623 @@
+#!/bin/sh
+#
+
+test_description='list functionality
+
+This test checks various list functionality including
+sorting, output filtering and line numbering.
+'
+. ./test-lib.sh
+
+TEST_TODO_=todo.cfg
+
+cat > todo.txt <<EOF
+ccc xxx this line should be third.
+aaa zzz this line should be first.
+bbb yyy this line should be second.
+EOF
+
+#
+# check the sort filter
+#
+TEST_TODO1_=todo1.cfg
+sed -e "s/^.*export TODOTXT_SORT_COMMAND=.*$/export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -r -f -k2'/" "${TEST_TODO_}" > "${TEST_TODO1_}"
+
+test_todo_session 'checking TODOTXT_SORT_COMMAND' <<EOF
+>>> todo.sh ls
+2 aaa zzz this line should be first.
+3 bbb yyy this line should be second.
+1 ccc xxx this line should be third.
+--
+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
+EOF
+
+#
+# check the final filter
+#
+TEST_TODO2_=todo2.cfg
+sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"sed 's/^\\\(..\\\{20\\\}\\\).....*$/\\\1.../'\"%" "${TEST_TODO_}" > "${TEST_TODO2_}"
+
+test_todo_session 'checking TODOTXT_FINAL_FILTER' <<EOF
+>>> todo.sh -d "$TEST_TODO2_" ls
+2 aaa zzz this line s...
+3 bbb yyy this line s...
+1 ccc xxx this line s...
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+#
+# check the x command line option
+#
+TEST_TODO3_=todo3.cfg
+sed -e "s%^.*export TODOTXT_FINAL_FILTER=.*$%export TODOTXT_FINAL_FILTER=\"grep -v xxx\"%" "${TEST_TODO_}" > "${TEST_TODO3_}"
+
+cat > todo.txt <<EOF
+foo
+bar xxx
+baz
+EOF
+
+test_todo_session 'final filter suppression' <<EOF
+>>> todo.sh -d "$TEST_TODO3_" ls
+3 baz
+1 foo
+--
+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
+EOF
+
+#
+# check the p command line option
+#
+cat > todo.txt <<EOF
+(A) @con01 +prj01 -- Some project 01 task, pri A
+(A) @con01 +prj02 -- Some project 02 task, pri A
+(A) @con02 +prj03 -- Some project 03 task, pri A
+(A) @con02 +prj04 -- Some project 04 task, pri A
+(B) @con01 +prj01 -- Some project 01 task, pri B
+(B) @con01 +prj02 -- Some project 02 task, pri B
+(B) @con02 +prj03 -- Some project 03 task, pri B
+(B) @con02 +prj04 -- Some project 04 task, pri B
+(C) @con01 +prj01 -- Some project 01 task, pri C
+(C) @con01 +prj02 -- Some project 02 task, pri C
+(C) @con02 +prj03 -- Some project 03 task, pri C
+(C) @con02 +prj04 -- Some project 04 task, pri C
+(D) @con01 +prj01 -- Some project 01 task, pri D
+(D) @con01 +prj02 -- Some project 02 task, pri D
+(D) @con02 +prj03 -- Some project 03 task, pri D
+(D) @con02 +prj04 -- Some project 04 task, pri D
+@con01 +prj01 -- Some project 01 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
+@con02 +prj03 -- Some project 03 task, no priorty
+@con02 +prj04 -- Some project 04 task, no priority
+EOF
+test_todo_session 'plain mode option' <<EOF
+>>> todo.sh ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+19 @con02 +prj03 -- Some project 03 task, no priorty
+20 @con02 +prj04 -- Some project 04 task, no priority
+--
+TODO: 20 of 20 tasks shown
+
+>>> todo.sh -p ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+19 @con02 +prj03 -- Some project 03 task, no priorty
+20 @con02 +prj04 -- Some project 04 task, no priority
+--
+TODO: 20 of 20 tasks shown
+EOF
+
+#
+# check the P,@,+ command line options
+#
+cat > todo.txt <<EOF
+(A) @con01 +prj01 -- Some project 01 task, pri A
+(A) @con01 +prj02 -- Some project 02 task, pri A
+(A) @con02 +prj03 -- Some project 03 task, pri A
+(A) @con02 +prj04 -- Some project 04 task, pri A
+(B) @con01 +prj01 -- Some project 01 task, pri B
+(B) @con01 +prj02 -- Some project 02 task, pri B
+(B) @con02 +prj03 -- Some project 03 task, pri B
+(B) @con02 +prj04 -- Some project 04 task, pri B
+(C) @con01 +prj01 -- Some project 01 task, pri C
+(C) @con01 +prj02 -- Some project 02 task, pri C
+(C) @con02 +prj03 -- Some project 03 task, pri C
+(C) @con02 +prj04 -- Some project 04 task, pri C
+(D) @con01 +prj01 -- Some project 01 task, pri D
+(D) @con01 +prj02 -- Some project 02 task, pri D
+(D) @con02 +prj03 -- Some project 03 task, pri D
+(D) @con02 +prj04 -- Some project 04 task, pri D
+@con01 +prj01 -- Some project 01 task, no priority
+@con01 +prj02 -- Some project 02 task, no priority
+@con02 +prj03 -- Some project 03 task, no priorty
+@con02 +prj04 -- Some project 04 task, no priority
+EOF
+test_todo_session 'context, project, and priority suppression' <<EOF
+>>> todo.sh ls
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+03 (A) @con02 +prj03 -- Some project 03 task, pri A
+04 (A) @con02 +prj04 -- Some project 04 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+07 (B) @con02 +prj03 -- Some project 03 task, pri B
+08 (B) @con02 +prj04 -- Some project 04 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+11 (C) @con02 +prj03 -- Some project 03 task, pri C
+12 (C) @con02 +prj04 -- Some project 04 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+15 (D) @con02 +prj03 -- Some project 03 task, pri D
+16 (D) @con02 +prj04 -- Some project 04 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+19 @con02 +prj03 -- Some project 03 task, no priorty
+20 @con02 +prj04 -- Some project 04 task, no priority
+--
+TODO: 20 of 20 tasks shown
+
+>>> todo.sh ls @con01
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -P ls @con01
+01 @con01 +prj01 -- Some project 01 task, pri A
+02 @con01 +prj02 -- Some project 02 task, pri A
+05 @con01 +prj01 -- Some project 01 task, pri B
+06 @con01 +prj02 -- Some project 02 task, pri B
+09 @con01 +prj01 -- Some project 01 task, pri C
+10 @con01 +prj02 -- Some project 02 task, pri C
+13 @con01 +prj01 -- Some project 01 task, pri D
+14 @con01 +prj02 -- Some project 02 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -+ ls @con01
+01 (A) @con01 -- Some project 01 task, pri A
+02 (A) @con01 -- Some project 02 task, pri A
+05 (B) @con01 -- Some project 01 task, pri B
+06 (B) @con01 -- Some project 02 task, pri B
+09 (C) @con01 -- Some project 01 task, pri C
+10 (C) @con01 -- Some project 02 task, pri C
+13 (D) @con01 -- Some project 01 task, pri D
+14 (D) @con01 -- Some project 02 task, pri D
+17 @con01 -- Some project 01 task, no priority
+18 @con01 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -@ ls @con01
+01 (A) +prj01 -- Some project 01 task, pri A
+02 (A) +prj02 -- Some project 02 task, pri A
+05 (B) +prj01 -- Some project 01 task, pri B
+06 (B) +prj02 -- Some project 02 task, pri B
+09 (C) +prj01 -- Some project 01 task, pri C
+10 (C) +prj02 -- Some project 02 task, pri C
+13 (D) +prj01 -- Some project 01 task, pri D
+14 (D) +prj02 -- Some project 02 task, pri D
+17 +prj01 -- Some project 01 task, no priority
+18 +prj02 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -P -@ ls @con01
+01 +prj01 -- Some project 01 task, pri A
+02 +prj02 -- Some project 02 task, pri A
+05 +prj01 -- Some project 01 task, pri B
+06 +prj02 -- Some project 02 task, pri B
+09 +prj01 -- Some project 01 task, pri C
+10 +prj02 -- Some project 02 task, pri C
+13 +prj01 -- Some project 01 task, pri D
+14 +prj02 -- Some project 02 task, pri D
+17 +prj01 -- Some project 01 task, no priority
+18 +prj02 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -P -@ -+ -P -@ -+ ls @con01
+01 (A) @con01 +prj01 -- Some project 01 task, pri A
+02 (A) @con01 +prj02 -- Some project 02 task, pri A
+05 (B) @con01 +prj01 -- Some project 01 task, pri B
+06 (B) @con01 +prj02 -- Some project 02 task, pri B
+09 (C) @con01 +prj01 -- Some project 01 task, pri C
+10 (C) @con01 +prj02 -- Some project 02 task, pri C
+13 (D) @con01 +prj01 -- Some project 01 task, pri D
+14 (D) @con01 +prj02 -- Some project 02 task, pri D
+17 @con01 +prj01 -- Some project 01 task, no priority
+18 @con01 +prj02 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+
+>>> todo.sh -P -@ -+ -P -@ -+ -P -@ -+ ls @con01
+01 -- Some project 01 task, pri A
+02 -- Some project 02 task, pri A
+05 -- Some project 01 task, pri B
+06 -- Some project 02 task, pri B
+09 -- Some project 01 task, pri C
+10 -- Some project 02 task, pri C
+13 -- Some project 01 task, pri D
+14 -- Some project 02 task, pri D
+17 -- Some project 01 task, no priority
+18 -- Some project 02 task, no priority
+--
+TODO: 10 of 20 tasks shown
+EOF
+
+#
+# check the line number padding
+#
+cat > todo.txt <<EOF
+hex00 this is one line
+hex01 this is another line
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+hex0A this is another line
+hex0B this is another line
+hex0C this is another line
+hex0D this is another line
+hex0E this is another line
+hex0F this is another line
+hex10 this is line is a multiple of 16
+hex11 this is another line
+hex12 this is another line
+hex13 this is another line
+hex14 this is another line
+hex15 this is another line
+hex16 this is another line
+hex17 this is another line
+hex18 this is another line
+hex19 this is another line
+hex1A this is another line
+hex1B this is another line
+hex1C this is another line
+hex1D this is another line
+hex1E this is another line
+hex1F this is another line
+hex20 this is line is a multiple of 16
+hex21 this is another line
+hex22 this is another line
+hex23 this is another line
+hex24 this is another line
+hex25 this is another line
+hex26 this is another line
+hex27 this is another line
+hex28 this is another line
+hex29 this is another line
+hex2A this is another line
+hex2B this is another line
+hex2C this is another line
+hex2D this is another line
+hex2E this is another line
+hex2F this is another line
+hex30 this is line is a multiple of 16
+hex31 this is another line
+hex32 this is another line
+hex33 this is another line
+hex34 this is another line
+hex35 this is another line
+hex36 this is another line
+hex37 this is another line
+hex38 this is another line
+hex39 this is another line
+hex3A this is another line
+hex3B this is another line
+hex3C this is another line
+hex3D this is another line
+hex3E this is another line
+hex3F this is another line
+hex40 this is line is a multiple of 16
+hex41 this is another line
+hex42 this is another line
+hex43 this is another line
+hex44 this is another line
+hex45 this is another line
+hex46 this is another line
+hex47 this is another line
+hex48 this is another line
+hex49 this is another line
+hex4A this is another line
+hex4B this is another line
+hex4C this is another line
+hex4D this is another line
+hex4E this is another line
+hex4F this is another line
+hex50 this is line is a multiple of 16
+hex51 this is another line
+hex52 this is another line
+hex53 this is another line
+hex54 this is another line
+hex55 this is another line
+hex56 this is another line
+hex57 this is another line
+hex58 this is another line
+hex59 this is another line
+hex5A this is another line
+hex5B this is another line
+hex5C this is another line
+hex5D this is another line
+hex5E this is another line
+hex5F this is another line
+hex60 this is line is a multiple of 16
+hex61 this is another line
+hex62 this is another line
+hex63 this is another line
+hex64 this is another line
+hex65 this is another line
+hex66 this is another line
+hex67 this is another line
+hex68 this is another line
+hex69 this is another line
+hex6A this is another line
+hex6B this is another line
+hex6C this is another line
+hex6D this is another line
+hex6E this is another line
+hex6F this is another line
+EOF
+test_todo_session 'check line number padding, out to 3 digits' <<EOF
+>>> todo.sh ls
+001 hex00 this is one line
+002 hex01 this is another line
+003 hex02 this is another line
+004 hex03 this is another line
+005 hex04 this is another line
+006 hex05 this is another line
+007 hex06 this is another line
+008 hex07 this is another line
+009 hex08 this is another line
+010 hex09 this is another line
+011 hex0A this is another line
+012 hex0B this is another line
+013 hex0C this is another line
+014 hex0D this is another line
+015 hex0E this is another line
+016 hex0F this is another line
+017 hex10 this is line is a multiple of 16
+018 hex11 this is another line
+019 hex12 this is another line
+020 hex13 this is another line
+021 hex14 this is another line
+022 hex15 this is another line
+023 hex16 this is another line
+024 hex17 this is another line
+025 hex18 this is another line
+026 hex19 this is another line
+027 hex1A this is another line
+028 hex1B this is another line
+029 hex1C this is another line
+030 hex1D this is another line
+031 hex1E this is another line
+032 hex1F this is another line
+033 hex20 this is line is a multiple of 16
+034 hex21 this is another line
+035 hex22 this is another line
+036 hex23 this is another line
+037 hex24 this is another line
+038 hex25 this is another line
+039 hex26 this is another line
+040 hex27 this is another line
+041 hex28 this is another line
+042 hex29 this is another line
+043 hex2A this is another line
+044 hex2B this is another line
+045 hex2C this is another line
+046 hex2D this is another line
+047 hex2E this is another line
+048 hex2F this is another line
+049 hex30 this is line is a multiple of 16
+050 hex31 this is another line
+051 hex32 this is another line
+052 hex33 this is another line
+053 hex34 this is another line
+054 hex35 this is another line
+055 hex36 this is another line
+056 hex37 this is another line
+057 hex38 this is another line
+058 hex39 this is another line
+059 hex3A this is another line
+060 hex3B this is another line
+061 hex3C this is another line
+062 hex3D this is another line
+063 hex3E this is another line
+064 hex3F this is another line
+065 hex40 this is line is a multiple of 16
+066 hex41 this is another line
+067 hex42 this is another line
+068 hex43 this is another line
+069 hex44 this is another line
+070 hex45 this is another line
+071 hex46 this is another line
+072 hex47 this is another line
+073 hex48 this is another line
+074 hex49 this is another line
+075 hex4A this is another line
+076 hex4B this is another line
+077 hex4C this is another line
+078 hex4D this is another line
+079 hex4E this is another line
+080 hex4F this is another line
+081 hex50 this is line is a multiple of 16
+082 hex51 this is another line
+083 hex52 this is another line
+084 hex53 this is another line
+085 hex54 this is another line
+086 hex55 this is another line
+087 hex56 this is another line
+088 hex57 this is another line
+089 hex58 this is another line
+090 hex59 this is another line
+091 hex5A this is another line
+092 hex5B this is another line
+093 hex5C this is another line
+094 hex5D this is another line
+095 hex5E this is another line
+096 hex5F this is another line
+097 hex60 this is line is a multiple of 16
+098 hex61 this is another line
+099 hex62 this is another line
+100 hex63 this is another line
+101 hex64 this is another line
+102 hex65 this is another line
+103 hex66 this is another line
+104 hex67 this is another line
+105 hex68 this is another line
+106 hex69 this is another line
+107 hex6A this is another line
+108 hex6B this is another line
+109 hex6C this is another line
+110 hex6D this is another line
+111 hex6E this is another line
+112 hex6F this is another line
+--
+TODO: 112 of 112 tasks shown
+EOF
+
+#
+# check that blank lines are ignored.
+#
+
+# Less than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for less than 10 items' <<EOF
+>>> todo.sh ls
+1 hex00 this is one line
+3 hex02 this is another line
+4 hex03 this is another line
+5 hex04 this is another line
+6 hex05 this is another line
+7 hex06 this is another line
+8 hex07 this is another line
+--
+TODO: 7 of 7 tasks shown
+EOF
+
+# More than 10
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+hex06 this is another line
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (one blank)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+07 hex06 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 9 of 9 tasks shown
+EOF
+cat > todo.txt <<EOF
+hex00 this is one line
+
+hex02 this is another line
+hex03 this is another line
+hex04 this is another line
+hex05 this is another line
+
+hex07 this is another line
+hex08 this is another line
+hex09 this is another line
+EOF
+test_todo_session 'check that blank lines are ignored for blank lines whose ID begins with `0` (many blanks)' <<EOF
+>>> todo.sh ls
+01 hex00 this is one line
+03 hex02 this is another line
+04 hex03 this is another line
+05 hex04 this is another line
+06 hex05 this is another line
+08 hex07 this is another line
+09 hex08 this is another line
+10 hex09 this is another line
+--
+TODO: 8 of 8 tasks shown
+EOF
+
+test_done

tests/t1310-listcon.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+
+test_description='listcon functionality
+
+This test checks basic context listing functionality
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+item 1
+item 2
+item 3
+EOF
+test_expect_success 'listcon no contexts' '
+    todo.sh listcon > output && ! test -s output
+'
+
+cat > todo.txt <<EOF
+(A) @1 -- Some context 1 task, whitespace, one char
+(A) @c2 -- Some context 2 task, whitespace, two char
+@con03 -- Some context 3 task, no whitespace
+@con04 -- Some context 4 task, no whitespace
+@con05@con06 -- weird context
+EOF
+test_todo_session 'Single context per line' <<EOF
+>>> todo.sh listcon
+@1
+@c2
+@con03
+@con04
+@con05@con06
+EOF
+
+cat > todo.txt <<EOF
+@con01 -- Some context 1 task
+@con02 -- Some context 2 task
+@con02 @con03 -- Multi-context task
+EOF
+test_todo_session 'Multi-context per line' <<EOF
+>>> todo.sh listcon
+@con01
+@con02
+@con03
+EOF
+
+cat > todo.txt <<EOF
+@con01 -- Some context 1 task
+@con02 -- Some context 2 task
+@con02 ginatrapani@gmail.com -- Some context 2 task
+EOF
+test_todo_session 'listcon e-mail address test' <<EOF
+>>> todo.sh listcon
+@con01
+@con02
+EOF
+
+test_done

tests/t1320-listproj.sh

@@ -0,0 +1,58 @@
+#!/bin/sh
+#
+
+test_description='listproj functionality
+
+This test checks basic project listing functionality
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+item 1
+item 2
+item 3
+EOF
+test_expect_success 'listproj no projects' '
+    todo.sh listproj > output && ! test -s output
+'
+
+cat > todo.txt <<EOF
+(A) +1 -- Some project 1 task, whitespace, one char
+(A) +p2 -- Some project 2 task, whitespace, two char
++prj03 -- Some project 3 task, no whitespace
++prj04 -- Some project 4 task, no whitespace
++prj05+prj06 -- weird project
+EOF
+test_todo_session 'Single project per line' <<EOF
+>>> todo.sh listproj
++1
++p2
++prj03
++prj04
++prj05+prj06
+EOF
+
+cat > todo.txt <<EOF
++prj01 -- Some project 1 task
++prj02 -- Some project 2 task
++prj02 +prj03 -- Multi-project task
+EOF
+test_todo_session 'Multi-project per line' <<EOF
+>>> todo.sh listproj
++prj01
++prj02
++prj03
+EOF
+
+cat > todo.txt <<EOF
++prj01 -- Some project 1 task
++prj02 -- Some project 2 task
++prj02 ginatrapani+todo@gmail.com -- Some project 2 task
+EOF
+test_todo_session 'listproj embedded + test' <<EOF
+>>> todo.sh listproj
++prj01
++prj02
+EOF
+
+test_done

tests/t1400-prepend.sh

@@ -0,0 +1,60 @@
+#!/bin/sh
+
+test_description='basic prepend functionality
+'
+. ./test-lib.sh
+
+test_todo_session 'prepend usage' <<EOF
+>>> todo.sh prepend B B
+usage: todo.sh prepend ITEM# "TEXT TO PREPEND"
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+EOF
+test_todo_session 'basic prepend' <<EOF
+>>> todo.sh list
+1 (B) smell the uppercase Roses +flowers @outside
+2 notice the sunflowers
+3 stop
+--
+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
+
+>>> todo.sh prepend 2 test
+2: test notice the sunflowers
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown
+
+>>> todo.sh prepend 1 test
+1: (B) test smell the uppercase Roses +flowers @outside
+
+>>> todo.sh -p list
+1 (B) test smell the uppercase Roses +flowers @outside
+3 stop
+2 test notice the sunflowers
+--
+TODO: 3 of 3 tasks shown
+
+EOF
+
+test_todo_session 'prepend with &' <<EOF
+>>> todo.sh prepend 3 "no running & jumping now"
+3: no running & jumping now stop
+EOF
+
+test_done

tests/t1500-do.sh

@@ -0,0 +1,80 @@
+#!/bin/sh
+
+test_description='do functionality
+'
+. ./test-lib.sh
+
+#DATE=`date '+%Y-%m-%d'`
+
+test_todo_session 'do usage' <<EOF
+>>> todo.sh do B B
+usage: todo.sh do ITEM#
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+smell the uppercase Roses +flowers @outside
+notice the sunflowers
+stop
+remove1
+remove2
+remove3
+remove4
+EOF
+
+test_todo_session 'basic do' <<EOF
+>>> todo.sh list
+2 notice the sunflowers
+4 remove1
+5 remove2
+6 remove3
+7 remove4
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 7 of 7 tasks shown
+
+>>> todo.sh do 7,6
+7: x 2009-02-13 remove4
+TODO: 7 marked as done.
+6: x 2009-02-13 remove3
+TODO: 6 marked as done.
+x 2009-02-13 remove3
+x 2009-02-13 remove4
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+4 remove1
+5 remove2
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh do 5 4
+5: x 2009-02-13 remove2
+TODO: 5 marked as done.
+4: x 2009-02-13 remove1
+TODO: 4 marked as done.
+x 2009-02-13 remove1
+x 2009-02-13 remove2
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+2 notice the sunflowers
+1 smell the uppercase Roses +flowers @outside
+3 stop
+--
+TODO: 3 of 3 tasks shown
+EOF
+
+test_todo_session 'fail multiple do attempts' <<EOF
+>>> todo.sh -a do 3
+3: x 2009-02-13 stop
+TODO: 3 marked as done.
+
+>>> todo.sh -a do 3
+3 is already marked done
+EOF
+test_done

tests/t1550-done.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+
+test_description='done functionality
+'
+. ./test-lib.sh
+
+#DATE=`date '+%Y-%m-%d'`
+
+test_todo_session 'done usage' <<EOF
+>>> export TODOTXT_FORCE=1
+
+>>> todo.sh done
+usage: todo.sh done "TODO ITEM"
+=== 1
+EOF
+
+cat > todo.txt <<EOF
+stop
+remove1
+remove2
+remove3
+remove4
+EOF
+
+test_todo_session 'basic done' <<EOF
+>>> todo.sh lsa
+2 remove1
+3 remove2
+4 remove3
+5 remove4
+1 stop
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh done smell the uppercase Roses
+TODO: 'smell the uppercase Roses' marked as done.
+
+>>> todo.sh done notice the sunflowers
+TODO: 'notice the sunflowers' marked as done.
+
+>>> todo.sh lsa
+2 remove1
+3 remove2
+4 remove3
+5 remove4
+1 stop
+7 x 2009-02-13 notice the sunflowers
+6 x 2009-02-13 smell the uppercase Roses
+--
+TODO: 7 of 7 tasks shown
+EOF
+test_done

tests/t1600-append.sh

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+test_description='basic append functionality
+
+Ensure we can append items successfully.
+'
+. ./test-lib.sh
+
+#
+# Set up the basic todo.txt
+#
+todo.sh add notice the daisies > /dev/null
+
+test_todo_session 'append usage' <<EOF
+>>> todo.sh append adf asdfa
+=== 1
+usage: todo.sh append ITEM# "TEXT TO APPEND"
+EOF
+
+test_todo_session 'basic append' <<EOF
+>>> todo.sh append 1 "smell the roses"
+1: notice the daisies smell the roses
+
+>>> todo.sh list
+1 notice the daisies smell the roses
+--
+TODO: 1 of 1 tasks shown
+EOF
+
+test_todo_session 'basic append with &' <<EOF
+>>> todo.sh append 1 "see the wasps & bees"
+1: notice the daisies smell the roses see the wasps & bees
+
+>>> todo.sh list
+1 notice the daisies smell the roses see the wasps & bees
+--
+TODO: 1 of 1 tasks shown
+EOF
+
+
+test_todo_session 'append error' << EOF
+>>> todo.sh append 10 "hej!"
+=== 1
+10: No such todo.
+EOF
+
+test_done

tests/t2000-multiline.sh

@@ -0,0 +1,132 @@
+#!/bin/sh
+
+test_description='Multi-line functionality'
+
+. ./test-lib.sh
+
+## Replace test
+# Create the expected file
+echo "1: smell the cheese
+replaced with
+1: eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item replace' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run replace
+"$HOME/bin/todo.sh" replace 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Add test
+# Create the expected file
+echo "TODO: 'eat apples eat oranges drink milk' added on line 2.">$HOME/expect.multi
+
+test_expect_success 'multiline squash item add' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run add
+"$HOME/bin/todo.sh" add "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Append test
+# Create the expected file
+echo "1: smell the cheese eat apples eat oranges drink milk">$HOME/expect.multi
+
+test_expect_success 'multiline squash item append' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run append
+"$HOME/bin/todo.sh" append 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Prepend test
+# Create the expected file
+echo "1: eat apples eat oranges drink milk smell the cheese">$HOME/expect.multi
+
+test_expect_success 'multiline squash item prepend' '
+(
+# Prepare single line todo file
+cat /dev/null > $HOME/todo.txt
+"$HOME/bin/todo.sh" add smell the cheese
+
+# Run prepend
+"$HOME/bin/todo.sh" prepend 1 "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+## Multiple line addition
+# Create the expected file
+echo "TODO: 'eat apples' added on line 2." > $HOME/expect.multi
+echo "TODO: 'eat oranges' added on line 3." >>$HOME/expect.multi
+echo "TODO: 'drink milk' added on line 4." >> $HOME/expect.multi
+
+test_expect_success 'actual multiline add' '
+(
+# Run addm
+"$HOME/bin/todo.sh" addm "eat apples
+eat oranges
+drink milk" > $HOME/output.multi
+
+# Test output against expected
+diff "$HOME/output.multi" "$HOME/expect.multi"
+if [ $? -ne 0 ]; then
+  exit 1
+else
+  exit 0
+fi
+)
+'
+
+test_done

tests/t9999-testsuite_example.sh

@@ -0,0 +1,168 @@
+#!/bin/sh
+
+test_description='basic tests imported from previous framework
+'
+. ./test-lib.sh
+
+cat > todo.txt <<EOF
+(B) smell the uppercase Roses +flowers @outside
+(A) notice the sunflowers
+stop
+smell the coffee +wakeup
+EOF
+test_todo_session 'basic tests' <<EOF
+>>> 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
+
+>>> todo.sh -p list +flowers
+1 (B) smell the uppercase Roses +flowers @outside
+--
+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
+
+>>> todo.sh -p list flowers out
+1 (B) smell the uppercase Roses +flowers @outside
+--
+TODO: 1 of 4 tasks shown
+
+>>> todo.sh -a do 2
+2: x 2009-02-13 notice the sunflowers
+TODO: 2 marked as done.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 smell the coffee +wakeup
+3 stop
+2 x 2009-02-13 notice the sunflowers
+--
+TODO: 4 of 4 tasks shown
+
+>>> todo.sh add "make the coffee +wakeup"
+TODO: 'make the coffee +wakeup' added on line 5.
+
+>>> todo.sh -p list coffee
+5 make the coffee +wakeup
+4 smell the coffee +wakeup
+--
+TODO: 2 of 5 tasks shown
+
+>>> todo.sh add "visit http://example.com"
+TODO: 'visit http://example.com' added on line 6.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+5 make the coffee +wakeup
+4 smell the coffee +wakeup
+3 stop
+6 visit http://example.com
+2 x 2009-02-13 notice the sunflowers
+--
+TODO: 6 of 6 tasks shown
+
+>>> todo.sh archive
+x 2009-02-13 notice the sunflowers
+TODO: $HOME/todo.txt archived.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh report
+TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+
+>>> todo.sh report
+TODO: Report file updated.
+2009-02-13-04:40:00 5 1
+2009-02-13-04:40:00 5 1
+
+>>> todo.sh append g a
+usage: todo.sh append ITEM# "TEXT TO APPEND"
+=== 1
+
+>>> todo.sh append 2 and think
+2: stop and think
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh append 10 "hej!"
+10: No such todo.
+=== 1
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh do 10
+10: No such todo.
+=== 1
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 5 of 5 tasks shown
+
+>>> todo.sh add "the coffee +wakeup"
+TODO: 'the coffee +wakeup' added on line 6.
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+6 the coffee +wakeup
+5 visit http://example.com
+--
+TODO: 6 of 6 tasks shown
+
+>>> todo.sh prepend 6 "make"
+6: make the coffee +wakeup
+
+>>> todo.sh -p list
+1 (B) smell the uppercase Roses +flowers @outside
+4 make the coffee +wakeup
+6 make the coffee +wakeup
+3 smell the coffee +wakeup
+2 stop and think
+5 visit http://example.com
+--
+TODO: 6 of 6 tasks shown
+
+>>> todo.sh remdup
+Usage: todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]
+Try 'todo.sh -h' for more information.
+=== 1
+EOF
+
+test_done

tests/test-lib.sh

@@ -0,0 +1,609 @@
+#!/bin/sh
+#
+# Copyright (c) 2005 Junio C Hamano
+#
+
+# if --tee was passed, write the output not only to the terminal, but
+# additionally to the file test-results/$BASENAME.out, too.
+case "$TEST_TEE_STARTED, $* " in
+done,*)
+	# do not redirect again
+	;;
+*' --tee '*|*' --va'*)
+	mkdir -p test-results
+	BASE=test-results/$(basename "$0" .sh)
+	(TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1;
+	 echo $? > $BASE.exit) | tee $BASE.out
+	test "$(cat $BASE.exit)" = 0
+	exit
+	;;
+esac
+
+# Keep the original TERM for say_color
+ORIGINAL_TERM=$TERM
+
+# For repeatability, reset the environment to known value.
+LANG=C
+LC_ALL=C
+PAGER=cat
+TZ=UTC
+TERM=dumb
+export LANG LC_ALL PAGER TERM TZ
+EDITOR=:
+VISUAL=:
+
+# Protect ourselves from common misconfiguration to export
+# CDPATH into the environment
+unset CDPATH
+
+# Protect ourselves from using predefined TODOTXT_CFG_FILE
+unset TODOTXT_CFG_FILE $(set|sed '/^TODOTXT_/!d;s/=.*//')
+# To prevent any damage if someone has still those exported somehow in his env:
+unset TODO_FILE DONE_FILE REPORT_FILE TMP_FILE
+
+# Each test should start with something like this, after copyright notices:
+#
+# test_description='Description of this test...
+# This test checks if command xyzzy does the right thing...
+# '
+# . ./test-lib.sh
+[ "x$ORIGINAL_TERM" != "xdumb" ] && (
+		TERM=$ORIGINAL_TERM &&
+		export TERM &&
+		[ -t 1 ] &&
+		tput bold >/dev/null 2>&1 &&
+		tput setaf 1 >/dev/null 2>&1 &&
+		tput sgr0 >/dev/null 2>&1
+	) &&
+	color=t
+
+while test "$#" -ne 0
+do
+	case "$1" in
+	-d|--d|--de|--deb|--debu|--debug)
+		debug=t; shift ;;
+	-i|--i|--im|--imm|--imme|--immed|--immedi|--immedia|--immediat|--immediate)
+		immediate=t; shift ;;
+	-l|--l|--lo|--lon|--long|--long-|--long-t|--long-te|--long-tes|--long-test|--long-tests)
+		TODOTXT_TEST_LONG=t; export TODOTXT_TEST_LONG; shift ;;
+	-h|--h|--he|--hel|--help)
+		help=t; shift ;;
+	-v|--v|--ve|--ver|--verb|--verbo|--verbos|--verbose)
+		verbose=t; shift ;;
+	-q|--q|--qu|--qui|--quie|--quiet)
+		quiet=t; shift ;;
+	--no-color)
+		color=; shift ;;
+	--no-python)
+		# noop now...
+		shift ;;
+	--tee)
+		shift ;; # was handled already
+	*)
+		break ;;
+	esac
+done
+
+if test -n "$color"; then
+	say_color () {
+		(
+		TERM=$ORIGINAL_TERM
+		export TERM
+		case "$1" in
+			error) tput bold; tput setaf 1;; # bold red
+			skip)  tput bold; tput setaf 2;; # bold green
+			pass)  tput setaf 2;;            # green
+			info)  tput setaf 3;;            # brown
+			*) test -n "$quiet" && return;;
+		esac
+		shift
+		printf "* %s" "$*"
+		tput sgr0
+		echo
+		)
+	}
+else
+	say_color() {
+		test -z "$1" && test -n "$quiet" && return
+		shift
+		echo "* $*"
+	}
+fi
+
+error () {
+	say_color error "error: $*"
+	trap - EXIT
+	exit 1
+}
+
+say () {
+	say_color info "$*"
+}
+
+test "${test_description}" != "" ||
+error "Test script did not set test_description."
+
+if test "$help" = "t"
+then
+	echo "$test_description"
+	exit 0
+fi
+
+exec 5>&1
+if test "$verbose" = "t"
+then
+	exec 4>&2 3>&1
+else
+	exec 4>/dev/null 3>/dev/null
+fi
+
+test_failure=0
+test_count=0
+test_fixed=0
+test_broken=0
+test_success=0
+
+die () {
+	echo >&5 "FATAL: Unexpected exit with code $?"
+	exit 1
+}
+
+trap 'die' EXIT
+
+# The semantics of the editor variables are that of invoking
+# sh -c "$EDITOR \"$@\"" files ...
+#
+# If our trash directory contains shell metacharacters, they will be
+# interpreted if we just set $EDITOR directly, so do a little dance with
+# environment variables to work around this.
+#
+# In particular, quoting isn't enough, as the path may contain the same quote
+# that we're using.
+test_set_editor () {
+	FAKE_EDITOR="$1"
+	export FAKE_EDITOR
+	VISUAL='"$FAKE_EDITOR"'
+	export VISUAL
+}
+
+# You are not expected to call test_ok_ and test_failure_ directly, use
+# the text_expect_* functions instead.
+
+test_ok_ () {
+	test_success=$(($test_success + 1))
+	say_color "" "  ok $test_count: $@"
+}
+
+test_failure_ () {
+	test_failure=$(($test_failure + 1))
+	say_color error "FAIL $test_count: $1"
+	shift
+	echo "$@" | sed -e 's/^/	/'
+	test "$immediate" = "" || { trap - EXIT; exit 1; }
+}
+
+test_known_broken_ok_ () {
+	test_fixed=$(($test_fixed+1))
+	say_color "" "  FIXED $test_count: $@"
+}
+
+test_known_broken_failure_ () {
+	test_broken=$(($test_broken+1))
+	say_color skip "  still broken $test_count: $@"
+}
+
+test_debug () {
+	test "$debug" = "" || eval "$1"
+}
+
+test_run_ () {
+	eval >&3 2>&4 "$1"
+	eval_ret="$?"
+	return 0
+}
+
+test_skip () {
+	test_count=$(($test_count+1))
+	to_skip=
+	for skp in $SKIP_TESTS
+	do
+		case $this_test.$test_count in
+		$skp)
+			to_skip=t
+		esac
+	done
+	case "$to_skip" in
+	t)
+		say_color skip >&3 "skipping test: $@"
+		say_color skip "skip $test_count: $1"
+		: true
+		;;
+	*)
+		false
+		;;
+	esac
+}
+
+test_expect_failure () {
+	test "$#" = 2 ||
+	error "bug in the test script: not 2 parameters to test-expect-failure"
+	if ! test_skip "$@"
+	then
+		say >&3 "checking known breakage: $2"
+		test_run_ "$2"
+		if [ "$?" = 0 -a "$eval_ret" = 0 ]
+		then
+			test_known_broken_ok_ "$1"
+		else
+		    test_known_broken_failure_ "$1"
+		fi
+	fi
+	echo >&3 ""
+}
+
+test_expect_success () {
+	test "$#" = 2 ||
+	error "bug in the test script: not 2 parameters to test-expect-success"
+	if ! test_skip "$@"
+	then
+		say >&3 "expecting success: $2"
+		test_run_ "$2"
+		if [ "$?" = 0 -a "$eval_ret" = 0 ]
+		then
+			test_ok_ "$1"
+		else
+			test_failure_ "$@"
+		fi
+	fi
+	echo >&3 ""
+}
+
+test_expect_code () {
+	test "$#" = 3 ||
+	error "bug in the test script: not 3 parameters to test-expect-code"
+	if ! test_skip "$@"
+	then
+		say >&3 "expecting exit code $1: $3"
+		test_run_ "$3"
+		if [ "$?" = 0 -a "$eval_ret" = "$1" ]
+		then
+			test_ok_ "$2"
+		else
+			test_failure_ "$@"
+		fi
+	fi
+	echo >&3 ""
+}
+
+# test_external runs external test scripts that provide continuous
+# test output about their progress, and succeeds/fails on
+# zero/non-zero exit code.  It outputs the test output on stdout even
+# in non-verbose mode, and announces the external script with "* run
+# <n>: ..." before running it.  When providing relative paths, keep in
+# mind that all scripts run in "trash directory".
+# Usage: test_external description command arguments...
+# Example: test_external 'Perl API' perl ../path/to/test.pl
+test_external () {
+	test "$#" -eq 3 ||
+	error >&5 "bug in the test script: not 3 parameters to test_external"
+	descr="$1"
+	shift
+	if ! test_skip "$descr" "$@"
+	then
+		# Announce the script to reduce confusion about the
+		# test output that follows.
+		say_color "" " run $test_count: $descr ($*)"
+		# Run command; redirect its stderr to &4 as in
+		# test_run_, but keep its stdout on our stdout even in
+		# non-verbose mode.
+		"$@" 2>&4
+		if [ "$?" = 0 ]
+		then
+			test_ok_ "$descr"
+		else
+			test_failure_ "$descr" "$@"
+		fi
+	fi
+}
+
+# Like test_external, but in addition tests that the command generated
+# no output on stderr.
+test_external_without_stderr () {
+	# The temporary file has no (and must have no) security
+	# implications.
+	tmp="$TMPDIR"; if [ -z "$tmp" ]; then tmp=/tmp; fi
+	stderr="$tmp/todotxt-external-stderr.$$.tmp"
+	test_external "$@" 4> "$stderr"
+	[ -f "$stderr" ] || error "Internal error: $stderr disappeared."
+	descr="no stderr: $1"
+	shift
+	say >&3 "expecting no stderr from previous command"
+	if [ ! -s "$stderr" ]; then
+		rm "$stderr"
+		test_ok_ "$descr"
+	else
+		if [ "$verbose" = t ]; then
+			output=`echo; echo Stderr is:; cat "$stderr"`
+		else
+			output=
+		fi
+		# rm first in case test_failure exits.
+		rm "$stderr"
+		test_failure_ "$descr" "$@" "$output"
+	fi
+}
+
+# This is not among top-level (test_expect_success | test_expect_failure)
+# but is a prefix that can be used in the test script, like:
+#
+#	test_expect_success 'complain and die' '
+#           do something &&
+#           do something else &&
+#	    test_must_fail git checkout ../outerspace
+#	'
+#
+# Writing this as "! git checkout ../outerspace" is wrong, because
+# the failure could be due to a segv.  We want a controlled failure.
+
+test_must_fail () {
+	"$@"
+	test $? -gt 0 -a $? -le 129 -o $? -gt 192
+}
+
+# test_cmp is a helper function to compare actual and expected output.
+# You can use it like:
+#
+#	test_expect_success 'foo works' '
+#		echo expected >expected &&
+#		foo >actual &&
+#		test_cmp expected actual
+#	'
+#
+# This could be written as either "cmp" or "diff -u", but:
+# - cmp's output is not nearly as easy to read as diff -u
+# - not all diff versions understand "-u"
+
+test_cmp() {
+	diff -u "$@"
+}
+
+test_done () {
+	trap - EXIT
+	test_results_dir="$TEST_DIRECTORY/test-results"
+	mkdir -p "$test_results_dir"
+	test_results_path="$test_results_dir/${0%.sh}-$$"
+
+	echo "total $test_count" >> $test_results_path
+	echo "success $test_success" >> $test_results_path
+	echo "fixed $test_fixed" >> $test_results_path
+	echo "broken $test_broken" >> $test_results_path
+	echo "failed $test_failure" >> $test_results_path
+	echo "" >> $test_results_path
+
+	if test "$test_fixed" != 0
+	then
+		say_color pass "fixed $test_fixed known breakage(s)"
+	fi
+	if test "$test_broken" != 0
+	then
+		say_color error "still have $test_broken known breakage(s)"
+		msg="remaining $(($test_count-$test_broken)) test(s)"
+	else
+		msg="$test_count test(s)"
+	fi
+	case "$test_failure" in
+	0)
+		say_color pass "passed all $msg"
+
+                # Clean up this test.
+		test -d "$remove_trash" &&
+		cd "$(dirname "$remove_trash")" &&
+		rm -rf "$(basename "$remove_trash")"
+
+		exit 0 ;;
+
+	*)
+		say_color error "failed $test_failure among $msg"
+		exit 1 ;;
+
+	esac
+}
+
+# Use -P to resolve symlinks in our working directory so that the pwd
+# in subprocesses equals our $PWD (for pathname comparisons).
+cd -P .
+
+# Record our location for reference.
+TEST_DIRECTORY=$(pwd)
+
+# Test repository
+test="trash directory.$(basename "$0" .sh)"
+test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test"
+rm -fr "$test" || {
+	trap - EXIT
+	echo >&5 "FATAL: Cannot prepare test area"
+	exit 1
+}
+
+# Most tests can use the created repository, but some may need to create more.
+# Usage: test_init_todo <directory>
+test_init_todo () {
+	test "$#" = 1 ||
+	error "bug in the test script: not 1 parameter to test_init_todo"
+	owd=`pwd`
+	root="$1"
+	mkdir -p "$root"
+	cd "$root" || error "Cannot setup todo dir in $root"
+        # Initialize the configuration file. Carefully quoted.
+        sed -e 's|TODO_DIR=.*$|TODO_DIR="'"$TEST_DIRECTORY/$test"'"|' $TEST_DIRECTORY/../todo.cfg > todo.cfg
+
+	# Install latest todo.sh
+	mkdir bin
+	ln -s "$TEST_DIRECTORY/../todo.sh" bin/todo.sh
+
+	# Initialize a hack date script
+	TODO_TEST_REAL_DATE=$(which date)
+	TODO_TEST_TIME=1234500000
+	export PATH TODO_TEST_REAL_DATE TODO_TEST_TIME
+
+	# Trying to detect the version of "date" on current system
+	DATE_STYLE=unknown
+	# on GNU systems (versions may vary):
+	#date --version
+	#date (GNU coreutils) 6.10
+	#...
+	if date --version 2>&1 | grep -q "GNU"; then
+		DATE_STYLE=GNU
+	# on Mac OS X 10.5:
+	#date --version
+	#date: illegal option -- -
+	#usage: date [-jnu] [-d dst] [-r seconds] [-t west] [-v[+|-]val[ymwdHMS]] ...
+	#[-f fmt date | [[[mm]dd]HH]MM[[cc]yy][.ss]] [+format]
+	elif date --version 2>&1 | grep -q -e "-jnu"; then
+		DATE_STYLE=Mac10.5
+	# on Mac OS X 10.4:
+	#date --version
+	#date: illegal option -- -
+	#usage: date [-nu] [-r seconds] [+format]
+	#       date [[[[[cc]yy]mm]dd]hh]mm[.ss]
+	elif date --version 2>&1 | grep -q -e "-nu"; then
+		DATE_STYLE=Mac10.4
+	fi
+
+	case $DATE_STYLE in
+		GNU)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -d @\$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		Mac10.5)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -j -f %s \$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		Mac10.4)
+			cat > bin/date <<-EOF
+			#!/bin/sh
+			exec "$TODO_TEST_REAL_DATE" -r \$TODO_TEST_TIME \$@
+			EOF
+			chmod 755 bin/date
+		;;
+		*)
+			echo "WARNING: Current date executable not recognized"
+			echo "So today date will be used, expect false negative tests..."
+		;;
+	esac
+
+	# Ensure a correct PATH for testing.
+	PATH=$owd/$root/bin:$PATH
+	export PATH
+
+	cd "$owd"
+}
+
+# Usage: test_tick [increment]
+test_tick () {
+	TODO_TEST_TIME=$(($TODO_TEST_TIME + ${1:-86400}))
+}
+
+# Generate and run a series of tests based on a transcript.
+# Usage: test_todo_session "description" <<EOF
+# >>> command
+# output1
+# output2
+# >>> command
+# === exit status
+# output3
+# output4
+# EOF
+test_todo_session () {
+    test "$#" = 1 ||
+    error "bug in the test script: extra args to test_todo_session"
+    subnum=1
+    cmd=""
+    status=0
+    > expect
+    while read line
+    do
+	case $line in
+	">>> "*)
+	    test -z "$cmd" || error "bug in the test script: missing blank line separator in test_todo_session"
+	    cmd=${line#>>> }
+	    ;;
+	"=== "*)
+	    status=${line#=== }
+	    ;;
+	"")
+	    if [ ! -z "$cmd" ]; then
+		if [ $status = 0 ]; then
+		    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
+		else
+		    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
+		fi
+
+		subnum=$(($subnum + 1))
+		cmd=""
+		status=0
+		> expect
+	    fi
+	    ;;
+	*)
+	    echo $line >> expect
+	    ;;
+	esac
+    done
+    if [ ! -z "$cmd" ]; then
+	if [ $status = 0 ]; then
+	    test_expect_success "$1 $subnum" "$cmd > output && test_cmp expect output"
+	else
+	    test_expect_success "$1 $subnum" "$cmd > output || test $? = $status && test_cmp expect output"
+	fi
+    fi
+}
+
+test_shell () {
+	trap - EXIT
+	export PS1='$(ret_val=$?; [ "$ret_val" != "0" ] && echo -e "=== $ret_val\n\n>>> "||echo "\n>>> ")'
+	cat <<EOF
+Do your tests session here and
+don't forget to replace the hardcoded path with \$HOME in the transcript:
+$HOME/todo.txt => \$HOME/todo.txt
+EOF
+	bash --noprofile --norc
+	exit 0
+}
+
+test_init_todo "$test"
+# Use -P to resolve symlinks in our working directory so that the pwd
+# in subprocesses equals our $PWD (for pathname comparisons).
+cd -P "$test" || exit 1
+
+# Since todo.sh refers to the home directory often,
+# make sure we don't accidentally grab the tester's config
+# but use something specified by the framework.
+HOME=$(pwd)
+export HOME
+
+this_test=${0##*/}
+this_test=${this_test%%-*}
+for skp in $SKIP_TESTS
+do
+	to_skip=
+	for skp in $SKIP_TESTS
+	do
+		case "$this_test" in
+		$skp)
+			to_skip=t
+		esac
+	done
+	case "$to_skip" in
+	t)
+		say_color skip >&3 "skipping test $this_test altogether"
+		say_color skip "skip all tests in $this_test"
+		test_done
+	esac
+done

tests/testshell.sh

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+test_description='Providing an interactive shell in the proper environment'
+. ./test-lib.sh
+
+test_shell

todo.cfg

@@ -10,32 +10,57 @@ export DONE_FILE="$TODO_DIR/done.txt"
 export REPORT_FILE="$TODO_DIR/report.txt"
 export TMP_FILE="$TODO_DIR/todo.tmp"
 
+# You can customize your actions directory location
+#export TODO_ACTIONS_DIR="$HOME/.todo.actions.d"
+
 # == EDIT FILE LOCATIONS ABOVE ===
 
 # === COLOR MAP ===
 
-export NONE=''
+## If you have re-mapped your color codes, you may need to
-export BLACK='\\033[0;30m'
+## over-ride by uncommenting and editing these defaults.
-export RED='\\033[0;31m'
+
-export GREEN='\\033[0;32m'
+# export BLACK='\\033[0;30m'
-export BROWN='\\033[0;33m'
+# export RED='\\033[0;31m'
-export BLUE='\\033[0;34m'
+# export GREEN='\\033[0;32m'
-export PURPLE='\\033[0;35m'
+# export BROWN='\\033[0;33m'
-export CYAN='\\033[0;36m'
+# export BLUE='\\033[0;34m'
-export LIGHT_GREY='\\033[0;37m'
+# export PURPLE='\\033[0;35m'
-export DARK_GREY='\\033[1;30m'
+# export CYAN='\\033[0;36m'
-export LIGHT_RED='\\033[1;31m'
+# export LIGHT_GREY='\\033[0;37m'
-export LIGHT_GREEN='\\033[1;32m'
+# export DARK_GREY='\\033[1;30m'
-export YELLOW='\\033[1;33m'
+# export LIGHT_RED='\\033[1;31m'
-export LIGHT_BLUE='\\033[1;34m'
+# export LIGHT_GREEN='\\033[1;32m'
-export LIGHT_PURPLE='\\033[1;35m'
+# export YELLOW='\\033[1;33m'
-export LIGHT_CYAN='\\033[1;36m'
+# export LIGHT_BLUE='\\033[1;34m'
-export WHITE='\\033[1;37m'
+# export LIGHT_PURPLE='\\033[1;35m'
-export DEFAULT='\\033[0m'
+# export LIGHT_CYAN='\\033[1;36m'
+# export WHITE='\\033[1;37m'
+# export DEFAULT='\\033[0m'
 
 # === PRIORITY COLORS ===
 
-export PRI_A=$YELLOW   # color for A priority
+## Priorities can be any upper-case letter.
-export PRI_B=$GREEN  # color for B priority
+## Colors are supported for the first three.
-export PRI_C=$LIGHT_BLUE   # color for C priority
+## Uncomment and edit to override these defaults.
-export PRI_X=$WHITE   # color for rest of them
+
+# export PRI_A=$YELLOW        # color for A priority
+# export PRI_B=$GREEN         # color for B priority
+# export PRI_C=$LIGHT_BLUE    # color for C priority
+# export PRI_X=$WHITE         # color for rest of them
+
+# === BEHAVIOR ===
+
+## customize list output
+#
+# TODOTXT_SORT_COMMAND will filter after line numbers are
+# inserted, but before colorization, and before hiding of
+# priority, context, and project.
+#
+# export TODOTXT_SORT_COMMAND='env LC_COLLATE=C sort -f -k2'
+
+# TODOTXT_FINAL_FILTER will filter list output after colorization,
+# priority hiding, context hiding, and project hiding. That is,
+# just before the list output is displayed.
+#
+# export TODOTXT_FINAL_FILTER='cat'

todo.sh

@@ -1,10 +1,11 @@
 #! /bin/bash
 
-# NOTE:  Todo.sh requires the todo.cfg configuration file to run.
+# NOTE:  Todo.sh requires the .todo/config configuration file to run.
-# Place the todo.cfg file in your home directory or use the -d option for a custom location.
+# Place the .todo/config file in your home directory or use the -d option for a custom location.
 
 [ -f VERSION-FILE ] && . VERSION-FILE || VERSION="@DEV_VERSION@"
-version() { sed -e 's/^    //' <<EndVersion
+version() {
+    cat <<-EndVersion
 		TODO.TXT Command Line Interface v$VERSION
 
 		First release: 5/11/2006
@@ -13,29 +14,36 @@ version() { sed -e 's/^    //' <<EndVersion
 		License: GPL, http://www.gnu.org/copyleft/gpl.html
 		More information and mailing list at http://todotxt.com
 		Code repository: http://github.com/ginatrapani/todo.txt-cli/tree/master
-EndVersion
+	EndVersion
     exit 1
 }
 
-oneline_usage="todo.sh [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
+# Set script name and full path early.
+TODO_SH=$(basename "$0")
+TODO_FULL_SH="$0"
+export TODO_SH TODO_FULL_SH
+
+oneline_usage="$TODO_SH [-fhpantvV] [-d todo_config] action [task_number] [task_description]"
 
 usage()
 {
-    sed -e 's/^    //' <<EndUsage
+    cat <<-EndUsage
 		Usage: $oneline_usage
-    Try 'todo.sh -h' for more information.
+		Try '$TODO_SH -h' for more information.
-EndUsage
+	EndUsage
     exit 1
 }
 
 shorthelp()
 {
-    sed -e 's/^    //' <<EndHelp
+    cat <<-EndHelp
 		  Usage: $oneline_usage
 
 		  Actions:
 		    add|a "THING I NEED TO DO +project @context"
 		    addto DEST "TEXT TO ADD"
+		    addm "THINGS I NEED TO DO
+		          MORE THINGS I NEED TO DO"
 		    append|app NUMBER "TEXT TO APPEND"
 		    archive
 		    command [ACTIONS]
@@ -56,13 +64,13 @@ shorthelp()
 		    report
 
 		  See "help" for more details.
-EndHelp
+	EndHelp
     exit 0
 }
 
 help()
 {
-    sed -e 's/^    //' <<EndHelp
+    cat <<-EndHelp
 		  Usage: $oneline_usage
 
 		  Actions:
@@ -72,6 +80,13 @@ help()
 		      Project and context notation optional.
 		      Quotes optional.
 
+		    addm "FIRST THING I NEED TO DO +project1 @context
+		    SECOND THING I NEED TO DO +project2 @context"
+		      Adds FIRST THING I NEED TO DO to your todo.txt on its own line and
+		      Adds SECOND THING I NEED TO DO to you todo.txt on its own line.
+		      Project and context notation optional.
+		      Quotes optional.
+
 		    addto DEST "TEXT TO ADD"
 		      Adds a line of text to any file located in the todo.txt directory.
 		      For example, addto inbox.txt "decide about vacation"
@@ -98,8 +113,8 @@ help()
 		      Deprioritizes (removes the priority) from the item
 		      on line NUMBER in todo.txt.
 
-        do NUMBER
+		    do NUMBER[, NUMBER, NUMBER, ...]
-          Marks item on line NUMBER as done in todo.txt.
+		      Marks item(s) on line NUMBER as done in todo.txt.
 
 		    help
 		      Display this help message.
@@ -168,7 +183,7 @@ help()
 		        Hide project names in list output. Use twice to show project
 		        names (default).
 		    -d CONFIG_FILE
-            Use a configuration file other than the default ~/todo.cfg
+		        Use a configuration file other than the default ~/.todo/config
 		    -f
 		        Forces actions without confirmation or interactive input
 		    -h
@@ -192,6 +207,8 @@ help()
 		        Extra verbose mode prints some debugging information
 		    -V
 		        Displays version, license and credits
+		    -x
+		        Disables TODOTXT_FINAL_FILTER
 
 
 		  Environment variables:
@@ -203,16 +220,18 @@ help()
 		    TODOTXT_DATE_ON_ADD=1           is same as option -t
 		    TODOTXT_VERBOSE=1               is same as option -v
 		    TODOTXT_DEFAULT_ACTION=""       run this when called with no arguments
-EndHelp
+		    TODOTXT_SORT_COMMAND="sort ..." customize list output
+		    TODOTXT_FINAL_FILTER="sed ..."  customize list after color, P@+ hiding
+	EndHelp
 
-    if [ -d "$HOME/.todo.actions.d" ]
+    if [ -d "$TODO_ACTIONS_DIR" ]
     then
         echo ""
-        for action in $HOME/.todo.actions.d/*
+        for action in "$TODO_ACTIONS_DIR"/*
         do
-            if [ -x $action ]
+            if [ -x "$action" ]
             then
-                $action usage
+                "$action" usage
             fi
         done
         echo ""
@@ -234,6 +253,21 @@ cleanup()
     exit 0
 }
 
+cleaninput()
+{
+    # Cleanup the input
+    # Replace newlines with spaces Always
+    input=`echo $input | tr -d '\r|\n'`
+
+    action_regexp="^\(append\|app\|prepend\|prep\|replace\)$"
+
+    # Check which action we are being used in as this affects what cleaning we do
+    if [ `echo $action | grep -c $action_regexp` -eq 1 ]; then
+        # These actions use sed and & as the matched string so escape it
+        input=`echo $input | sed 's/\&/\\\&/g'`
+    fi
+}
+
 archive()
 {
     #defragment blank lines
@@ -242,22 +276,24 @@ archive()
     grep "^x " "$TODO_FILE" >> "$DONE_FILE"
     sed -i.bak '/^x /d' "$TODO_FILE"
     cp "$TODO_FILE" "$TMP_FILE"
-    sed -n 'G; s/\n/&&/; /^\([ -~]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
+    sed -n 'G; s/\n/&&/; /^\([ ~-]*\n\).*\n\1/d; s/\n//; h; P' "$TMP_FILE" > "$TODO_FILE"
     #[[ $TODOTXT_VERBOSE -gt 0 ]] && echo "TODO: Duplicate tasks have been removed."
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $TODO_FILE archived."
+    [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+        _commit "TODO: $TODO_FILE archived." $TODO_FILE $DONE_FILE
     cleanup
 }
 
 
 # == PROCESS OPTIONS ==
-while getopts ":fhpnatvV+@Pd:" Option
+while getopts ":fhpnatvVx+@Pd:" Option
 do
   case $Option in
     '@' )
         ## HIDE_CONTEXT_NAMES starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number hides project names and an odd number shows project
+        ##   number shows context names and an odd number hides context
         ##   names.
         : $(( HIDE_CONTEXT_NAMES++ ))
         if [ $(( $HIDE_CONTEXT_NAMES % 2 )) -eq 0 ]
@@ -273,7 +309,7 @@ do
         ## HIDE_PROJECT_NAMES starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number hides project names and an odd number shows project
+        ##   number shows project names and an odd number hides project
         ##   names.
         : $(( HIDE_PROJECT_NAMES++ ))
         if [ $(( $HIDE_PROJECT_NAMES % 2 )) -eq 0 ]
@@ -307,8 +343,8 @@ do
         ## HIDE_PRIORITY_LABELS starts at zero (false); increment it to one
         ##   (true) the first time this flag is seen. Each time the flag
         ##   is seen after that, increment it again so that an even
-        ##   number hides project names and an odd number shows project
+        ##   number shows priority labels and an odd number hides priority
-        ##   names.
+        ##   labels.
         : $(( HIDE_PRIORITY_LABELS++ ))
         if [ $(( $HIDE_PRIORITY_LABELS % 2 )) -eq 0 ]
         then
@@ -328,6 +364,9 @@ do
     V )
         version
         ;;
+    x )
+        TODOTXT_DISABLE_FILTER=1
+        ;;
   esac
 done
 shift $(($OPTIND - 1))
@@ -335,12 +374,54 @@ shift $(($OPTIND - 1))
 # defaults if not yet defined
 TODOTXT_VERBOSE=${TODOTXT_VERBOSE:-1}
 TODOTXT_PLAIN=${TODOTXT_PLAIN:-0}
-TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/todo.cfg}
+TODOTXT_CFG_FILE=${TODOTXT_CFG_FILE:-$HOME/.todo/config}
 TODOTXT_FORCE=${TODOTXT_FORCE:-0}
 TODOTXT_PRESERVE_LINE_NUMBERS=${TODOTXT_PRESERVE_LINE_NUMBERS:-1}
 TODOTXT_AUTO_ARCHIVE=${TODOTXT_AUTO_ARCHIVE:-1}
 TODOTXT_DATE_ON_ADD=${TODOTXT_DATE_ON_ADD:-0}
 TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
+TODOTXT_SORT_COMMAND=${TODOTXT_SORT_COMMAND:-env LC_COLLATE=C sort -f -k2}
+TODOTXT_FINAL_FILTER=${TODOTXT_FINAL_FILTER:-cat}
+TODOTXT_GIT_ENABLED=${TODOTXT_GIT_ENABLED:-1}
+TODOTXT_GIT_VERBOSE=${TODOTXT_GIT_VERBOSE:-0}
+
+# Export all TODOTXT_* variables
+export ${!TODOTXT_@}
+
+# Default color map
+export NONE=''
+export BLACK='\\033[0;30m'
+export RED='\\033[0;31m'
+export GREEN='\\033[0;32m'
+export BROWN='\\033[0;33m'
+export BLUE='\\033[0;34m'
+export PURPLE='\\033[0;35m'
+export CYAN='\\033[0;36m'
+export LIGHT_GREY='\\033[0;37m'
+export DARK_GREY='\\033[1;30m'
+export LIGHT_RED='\\033[1;31m'
+export LIGHT_GREEN='\\033[1;32m'
+export YELLOW='\\033[1;33m'
+export LIGHT_BLUE='\\033[1;34m'
+export LIGHT_PURPLE='\\033[1;35m'
+export LIGHT_CYAN='\\033[1;36m'
+export WHITE='\\033[1;37m'
+export DEFAULT='\\033[0m'
+
+# Default priority->color map.
+export PRI_A=$YELLOW        # color for A priority
+export PRI_B=$GREEN         # color for B priority
+export PRI_C=$LIGHT_BLUE    # color for C priority
+export PRI_X=$WHITE         # color for rest of them
+
+[ -e "$TODOTXT_CFG_FILE" ] || {
+    CFG_FILE_ALT="$HOME/todo.cfg"
+
+    if [ -e "$CFG_FILE_ALT" ]
+    then
+        TODOTXT_CFG_FILE="$CFG_FILE_ALT"
+    fi
+}
 
 [ -e "$TODOTXT_CFG_FILE" ] || {
     CFG_FILE_ALT="$HOME/.todo.cfg"
@@ -351,10 +432,20 @@ TODOTXT_DEFAULT_ACTION=${TODOTXT_DEFAULT_ACTION:-}
     fi
 }
 
-export TODOTXT_VERBOSE TODOTXT_PLAIN TODOTXT_CFG_FILE TODOTXT_FORCE TODOTXT_PRESERVE_LINE_NUMBERS TODOTXT_AUTO_ARCHIVE TODOTXT_DATE_ON_ADD
+if [ -z "$TODO_ACTIONS_DIR" -o ! -d "$TODO_ACTIONS_DIR" ]
+then
+    TODO_ACTIONS_DIR="$HOME/.todo/actions"
+    export TODO_ACTIONS_DIR
+fi
 
-TODO_SH="$0"
+[ -d "$TODO_ACTIONS_DIR" ] || {
-export TODO_SH
+    TODO_ACTIONS_DIR_ALT="$HOME/.todo.actions.d"
+
+    if [ -d "$TODO_ACTIONS_DIR_ALT" ]
+    then
+        TODO_ACTIONS_DIR="$TODO_ACTIONS_DIR_ALT"
+    fi
+}
 
 # === SANITY CHECKS (thanks Karl!) ===
 [ -r "$TODOTXT_CFG_FILE" ] || die "Fatal error: Cannot read configuration file $TODOTXT_CFG_FILE"
@@ -383,6 +474,60 @@ fi
 # === HEAVY LIFTING ===
 shopt -s extglob
 
+_addto() {
+    file="$1"
+    input="$2"
+    cleaninput $input
+
+    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
+        now=`date '+%Y-%m-%d'`
+        input="$now $input"
+    fi
+    echo "$input" >> "$file"
+
+    ( [ $TODOTXT_VERBOSE -gt 0 ] || [ $TODOTXT_GIT_ENABLED -eq 1 ] ) && {
+        TASKNUM=$(sed -n '$ =' "$file")
+        BASE=$(basename "$file")
+        PREFIX=$(echo ${BASE%%.[^.]*} | tr [a-z] [A-Z])
+        MESG="${PREFIX}: '$input' added on line $TASKNUM."
+        [ $TODOTXT_VERBOSE -gt 0 ] && \
+            echo $MESG
+        [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+            _commit "$MESG" $file
+    }
+}
+
+_commit() {
+    [ -z "$1" ] && die "Fatal Error: No commit message."
+    [ -z "$2" ] && die "Fatal Error: No commit files."
+    MESG="$(echo $1 | sed -e 's|\\n|\n|g')"
+    shift
+    FILES=$*
+
+    if [ $TODOTXT_GIT_VERBOSE -eq 0 ] ; then
+        ( cd $TODO_DIR
+          for file in $FILES ; do
+              BASE=$(basename $file)
+              git add $BASE > /dev/null 2>&1
+              [ "$?" != 0 ] && die "Fatal Error: Git add $BASE failed."
+          done
+          git commit -m "$MESG" > /dev/null 2>&1
+          [ "$?" != 0 ] && die "Fatal Error: Git commit failed."
+        )
+    else
+        ( cd $TODO_DIR
+          for file in $FILES ; do
+              BASE=$(basename $file)
+              git add $BASE
+              [ "$?" != 0 ] && die "Fatal Error: Git add $BASE failed."
+          done
+          git commit -m "$MESG"
+          [ "$?" != 0 ] && die "Fatal Error: Git commit failed."
+        )
+    fi
+
+}
+
 _list() {
     local FILE="$1"
     ## If the file starts with a "/" use absolute path. Otherwise,
@@ -441,10 +586,13 @@ _list() {
 
     ## Number the file, then run the filter command,
     ## then sort and mangle output some more
+    if [[ $TODOTXT_DISABLE_FILTER = 1 ]]; then
+        TODOTXT_FINAL_FILTER="cat"
+    fi
     items=$(
         sed = "$src"                                            \
         | sed "N; s/^/     /; s/ *\(.\{$PADDING,\}\)\n/\1 /"    \
-	| grep -v "^[0-9]\+ *$"
+        | grep -v "^[ 0-9]\+ *$"
     )
     if [ "${filter_command}" ]; then
         filtered_items=$(echo -ne "$items" | eval ${filter_command})
@@ -460,13 +608,13 @@ _list() {
             s/^  /00/;
             s/^ /0/;
           ''' \
-        | sort -f -k2                                           \
+        | eval ${TODOTXT_SORT_COMMAND}                                        \
         | sed '''
             /^[0-9]\{'$PADDING'\} x /! {
-                s/\(.*(A).*\)/'$PRI_A'\1 '$DEFAULT'/g;
+                s/\(.*(A).*\)/'$PRI_A'\1'$DEFAULT'/g;
-                s/\(.*(B).*\)/'$PRI_B'\1 '$DEFAULT'/g;
+                s/\(.*(B).*\)/'$PRI_B'\1'$DEFAULT'/g;
-                s/\(.*(C).*\)/'$PRI_C'\1 '$DEFAULT'/g;
+                s/\(.*(C).*\)/'$PRI_C'\1'$DEFAULT'/g;
-                s/\(.*([D-Z]).*\)/'$PRI_X'\1 '$DEFAULT'/g;
+                s/\(.*([D-Z]).*\)/'$PRI_X'\1'$DEFAULT'/g;
             }
           '''                                                   \
         | sed '''
@@ -474,15 +622,18 @@ _list() {
             s/'${HIDE_PROJECTS_SUBSTITUTION:-^}'//g
             s/'${HIDE_CONTEXTS_SUBSTITUTION:-^}'//g
           '''                                                   \
+        | eval ${TODOTXT_FINAL_FILTER}                          \
     )
     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
@@ -505,9 +656,9 @@ then
     shift
     ## Reset action to new first argument
     action=$( printf "%s\n" "$1" | tr 'A-Z' 'a-z' )
-elif [ -d "$HOME/.todo.actions.d" -a -x "$HOME/.todo.actions.d/$action" ]
+elif [ -d "$TODO_ACTIONS_DIR" -a -x "$TODO_ACTIONS_DIR/$action" ]
 then
-    "$HOME/.todo.actions.d/$action" "$@"
+    "$TODO_ACTIONS_DIR/$action" "$@"
     cleanup
 fi
 
@@ -518,39 +669,52 @@ case $action in
         echo -n "Add: "
         read input
     else
-        [ -z "$2" ] && die "usage: $0 add \"TODO ITEM\""
+        [ -z "$2" ] && die "usage: $TODO_SH add \"TODO ITEM\""
+        shift
+        input=$*
+    fi
+    _addto "$TODO_FILE" "$input"
+    cleanup;;
+
+"addm")
+    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Add: "
+        read input
+    else
+        [ -z "$2" ] && die "usage: $TODO_SH addm \"TODO ITEM\""
         shift
         input=$*
     fi
 
-    if [[ $TODOTXT_DATE_ON_ADD = 1 ]]; then
+    # Set Internal Field Seperator as newline so we can 
-        now=`date '+%Y-%m-%d'`
+    # loop across multiple lines
-        input="$now $input"
+    SAVEIFS=$IFS
-    fi
+    IFS=$'\n'
-    echo "$input" >> "$TODO_FILE"
+
-    TASKNUM=$(sed -n '$ =' "$TODO_FILE")
+    # Treat each line seperately
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added on line $TASKNUM."
+    for line in $input ; do
+        _addto "$TODO_FILE" "$line"
+    done
+    IFS=$SAVEIFS
     cleanup;;
 
 "addto" )
-    [ -z "$2" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    [ -z "$2" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
     dest="$TODO_DIR/$2"
-    [ -z "$3" ] && die "usage: $0 addto DEST \"TODO ITEM\""
+    [ -z "$3" ] && die "usage: $TODO_SH addto DEST \"TODO ITEM\""
     shift
     shift
     input=$*
 
     if [ -f "$dest" ]; then
-        echo "$input" >> "$dest"
+        _addto "$dest" "$input"
-        TASKNUM=$(sed -n '$ =' "$dest")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$input' added to $dest on line $TASKNUM."
     else
         echo "TODO: Destination file $dest does not exist."
     fi
     cleanup;;
 
 "append" | "app" )
-    errmsg="usage: $0 append ITEM# \"TEXT TO APPEND\""
+    errmsg="usage: $TODO_SH append ITEM# \"TEXT TO APPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -563,9 +727,16 @@ case $action in
     else
         input=$*
     fi
+    cleaninput $input
+
     if sed -i.bak $item" s|^.*|& $input|" "$TODO_FILE"; then
+        [ $TODOTXT_VERBOSE -gt 0 ] && {
             newtodo=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+            echo "$item: $newtodo"
+        }
+        [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+            _commit "TODO: Appended '$todo' w/ '$input' on line $item." \
+                    $TODO_FILE
     else
         echo "TODO: Error appending task $item."
     fi
@@ -574,9 +745,18 @@ case $action in
 "archive" )
     archive;;
 
+"commit" )
+    [ -z "$2" ] && die "usage: $TODO_SH commit MESSAGE"
+    shift
+    MESG=$*
+
+    ( cd $TODO_DIR
+      git commit -a -m "$MESG"
+    );;
+
 "del" | "rm" )
     # replace deleted line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $0 del ITEM#"
+    errmsg="usage: $TODO_SH del ITEM#"
     item=$2
     [ -z "$item" ] && die "$errmsg"
 
@@ -584,7 +764,7 @@ case $action in
 
         [[ "$item" = +([0-9]) ]] || die "$errmsg"
         if sed -ne "$item p" "$TODO_FILE" | grep "^."; then
-            DELETEME=$(sed "$2!d" "$TODO_FILE")
+            DELETEME=$(sed "$item!d" "$TODO_FILE")
 
             if  [ $TODOTXT_FORCE = 0 ]; then
                 echo "Delete '$DELETEME'?  (y/n)"
@@ -595,12 +775,14 @@ case $action in
             if [ "$ANSWER" = "y" ]; then
                 if [ $TODOTXT_PRESERVE_LINE_NUMBERS = 0 ]; then
                     # delete line (changes line numbers)
-                    sed -i.bak -e $2"s/^.*//" -e '/./!d' "$TODO_FILE"
+                    sed -i.bak -e $item"s/^.*//" -e '/./!d' "$TODO_FILE"
                 else
                     # leave blank line behind (preserves line numbers)
-                    sed -i.bak -e $2"s/^.*//" "$TODO_FILE"
+                    sed -i.bak -e $item"s/^.*//" "$TODO_FILE"
                 fi
                 [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$DELETEME' deleted."
+                [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+                    _commit "TODO: '$DELETEME' deleted." $TODO_FILE
                 cleanup
             else
                 echo "TODO: No tasks were deleted."
@@ -611,53 +793,102 @@ case $action in
     else
         sed -i.bak -e $item"s/$3/ /g"  "$TODO_FILE"
         [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $3 removed from $item."
+        [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+            _commit "TODO: $3 removed from $item." $TODO_FILE
     fi ;;
 
 "depri" | "dp" )
     item=$2
-    errmsg="usage: $0 depri ITEM#"
+    errmsg="usage: $TODO_SH depri ITEM#"
 
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
-    sed -e $item"s/^(.*) //" "$TODO_FILE" > /dev/null 2>&1
+    sed -e $item"s/^(.) //" "$TODO_FILE" > /dev/null 2>&1
 
     if [ "$?" -eq 0 ]; then
         #it's all good, continue
-        sed -i.bak -e $2"s/^(.*) //" "$TODO_FILE"
+        sed -i.bak -e $item"s/^(.) //" "$TODO_FILE"
-        NEWTODO=$(sed "$2!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && {
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+            NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item deprioritized."
+            echo "`echo "$item: $NEWTODO"`"
+            echo "TODO: $item deprioritized."
+        }
+        [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+            _commit "TODO: '$todo' deprioritized." $TODO_FILE
         cleanup
     else
         die "$errmsg"
     fi;;
 
 "do" )
-    errmsg="usage: $0 do ITEM#"
+    errmsg="usage: $TODO_SH do ITEM#"
-    item=$2
+    # shift so we get arguments to the do request
+    shift;
+
+    # Split multiple do's, if comma seperated change to whitespace sepereated
+    # Loop the 'do' function for each item
+    for item in `echo $* | tr ',' ' '`; do 
         [ -z "$item" ] && die "$errmsg"
         [[ "$item" = +([0-9]) ]] || die "$errmsg"
 
         todo=$(sed "$item!d" "$TODO_FILE")
         [ -z "$todo" ] && die "$item: No such todo."
 
+        # Check if this item has already been done
+        if [ `echo $todo | grep -c "^x "` -eq 0 ] ; then
             now=`date '+%Y-%m-%d'`
             # remove priority once item is done
-    sed -i.bak $item"s/^(.*) //" "$TODO_FILE"
+            sed -i.bak $item"s/^(.) //" "$TODO_FILE"
             sed -i.bak $item"s|^|&x $now |" "$TODO_FILE"
+            [ $TODOTXT_VERBOSE -gt 0 ] && {
                 newtodo=$(sed "$item!d" "$TODO_FILE")
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+                echo "$item: $newtodo"
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item marked as done."
+                echo "TODO: $item marked as done."
+            }
+            [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+                _commit "TODO: '$todo' marked as done." $TODO_FILE
+        else
+            echo "$item is already marked done"
+        fi
+    done
 
     if [ $TODOTXT_AUTO_ARCHIVE = 1 ]; then
         archive
     fi
     cleanup ;;
 
+"done" )
+    if [[ -z "$2" && $TODOTXT_FORCE = 0 ]]; then
+        echo -n "Done: "
+        read input
+    else
+        [ -z "$2" ] && die "usage: $TODO_SH done \"TODO ITEM\""
+        shift
+        input=$*
+    fi
+
+    now=`date '+%Y-%m-%d'`
+    # remove priority once item is done
+    newtodo=$(sed -e "s/^(.) // ; s|^|&x $now |" <<<${input})
+    echo "$newtodo" >> "$DONE_FILE"
+    [ $TODOTXT_VERBOSE -gt 0 ] && {
+        echo "TODO: '$input' marked as done."
+    }
+    [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+        _commit "TODO: '$input' marked as done." $DONE_FILE
+
+    cleanup;;
+
 "help" )
-    help
+    if [ -t 1 ] ; then # STDOUT is a TTY
+        if (exec which ${PAGER:-less} 2>/dev/null >/dev/null); then
+            # we have a working PAGER (or less as a default)
+            help | exec ${PAGER:-less}
+        fi
+    fi
+    help # just in case something failed above, we go ahead and just spew to STDOUT
     ;;
 
 "list" | "ls" )
@@ -687,11 +918,11 @@ case $action in
     ;;
 
 "listcon" | "lsc" )
-    gawk '{for(i = 1; i <= NF; i++) print $i}' "$TODO_FILE" | grep '@' | sort | uniq
+    grep -o '[^ ]*@[^ ]\+' "$TODO_FILE" | grep '^@' | sort -u
     cleanup ;;
 
 "listproj" | "lsprj" )
-    gawk '{for(i = 1; i <= NF; i++) print $i}' "$TODO_FILE" | grep '+' | sort | uniq
+    grep -o '[^ ]*+[^ ]\+' "$TODO_FILE" | grep '^+' | sort -u
     cleanup ;;
 
 
@@ -702,7 +933,7 @@ case $action in
     then
         ## A priority was specified
         pri=$( printf "%s\n" "$1" | tr 'a-z' 'A-Z' | grep '^[A-Z]$' ) || {
-	    die "usage: $0 listpri PRIORITY
+            die "usage: $TODO_SH listpri PRIORITY
             note: PRIORITY must a single letter from A to Z."
         }
     else
@@ -714,9 +945,14 @@ case $action in
     _list "$TODO_FILE" "$pri"
     ;;
 
+"log" | "pull" | "push" )
+    ( cd $TODO_DIR
+      git $action
+    );;
+
 "move" | "mv" )
     # replace moved line with a blank line when TODOTXT_PRESERVE_LINE_NUMBERS is 1
-    errmsg="usage: $0 mv ITEM# DEST [SRC]"
+    errmsg="usage: $TODO_SH mv ITEM# DEST [SRC]"
     item=$2
     dest="$TODO_DIR/$3"
     src="$TODO_DIR/$4"
@@ -748,6 +984,9 @@ case $action in
                     echo "$MOVEME" >> "$dest"
 
                     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: '$MOVEME' moved from '$src' to '$dest'."
+                    [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+                        _commit "TODO: '$MOVEME' moved from '$src' to '$dest'." \
+                            $src $dest
                     cleanup
                 else
                     echo "TODO: No tasks moved."
@@ -764,7 +1003,7 @@ case $action in
     cleanup;;
 
 "prepend" | "prep" )
-    errmsg="usage: $0 prepend ITEM# \"TEXT TO PREPEND\""
+    errmsg="usage: $TODO_SH prepend ITEM# \"TEXT TO PREPEND\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -779,41 +1018,72 @@ case $action in
     else
         input=$*
     fi
+    cleaninput $input
 
+    # Test for then set priority
+    if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
+        priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
+    fi
+
+    # If priority isn't set prepend
+    if [ -z $priority ]; then 
         if sed -i.bak $item" s|^.*|$input &|" "$TODO_FILE"; then
+            [ $TODOTXT_VERBOSE -gt 0 ] && {
                 newtodo=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $newtodo"
+                echo "$item: $newtodo"
+            }
+            [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+                _commit "TODO: Prepended '$todo' w/ '$input' on line $item." \
+                        $TODO_FILE
         else
             echo "TODO: Error prepending task $item."
         fi
+    # If priority is set, remove priority, prepend and add back priority
+    else
+        if sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $1 &|" "$TODO_FILE"; then
+            [ $TODOTXT_VERBOSE -gt 0 ] && {
+                newtodo=$(sed "$item!d" "$TODO_FILE")
+                echo "$item: $newtodo"
+            }
+            [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+                _commit "TODO: Prepended '$todo' w/ '$input' on line $item." \
+                        $TODO_FILE
+        else
+            echo "TODO: Error prepending task $item."
+        fi
+    fi
     cleanup;;
 
 "pri" | "p" )
     item=$2
     newpri=$( printf "%s\n" "$3" | tr 'a-z' 'A-Z' )
 
-    errmsg="usage: $0 pri ITEM# PRIORITY
+    errmsg="usage: $TODO_SH pri ITEM# PRIORITY
 note: PRIORITY must be anywhere from A to Z."
 
     [ "$#" -ne 3 ] && die "$errmsg"
     [[ "$item" = +([0-9]) ]] || die "$errmsg"
-    [[ "$newpri" = +([A-Z]) ]] || die "$errmsg"
+    [[ "$newpri" = @([A-Z]) ]] || die "$errmsg"
 
-    sed -e $item"s/^(.*) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
+    sed -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE" > /dev/null 2>&1
 
     if [ "$?" -eq 0 ]; then
         #it's all good, continue
-        sed -i.bak -e $2"s/^(.*) //" -e $2"s/^/($newpri) /" "$TODO_FILE"
+        sed -i.bak -e $item"s/^(.) //" -e $item"s/^/($newpri) /" "$TODO_FILE"
-        NEWTODO=$(sed "$2!d" "$TODO_FILE")
+        [ $TODOTXT_VERBOSE -gt 0 ] && {
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo -e "`echo "$item: $NEWTODO"`"
+            NEWTODO=$(sed "$item!d" "$TODO_FILE")
-        [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: $item prioritized ($newpri)."
+            echo "`echo "$item: $NEWTODO"`"
+            echo "TODO: $item prioritized ($newpri)."
+        }
+        [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+            _commit "TODO: $item prioritized ($newpri)." $TODO_FILE
         cleanup
     else
         die "$errmsg"
     fi;;
 
 "replace" )
-    errmsg="usage: $0 replace ITEM# \"UPDATED ITEM\""
+    errmsg="usage: $TODO_SH replace ITEM# \"UPDATED ITEM\""
     shift; item=$1; shift
 
     [ -z "$item" ] && die "$errmsg"
@@ -822,17 +1092,33 @@ note:  PRIORITY must be anywhere from A to Z."
     todo=$(sed "$item!d" "$TODO_FILE")
     [ -z "$todo" ] && die "$item: No such todo."
 
+    # Test for then set priority
+    if [ `sed "$item!d" "$TODO_FILE"|grep -c "^(\\w)"` -eq 1 ]; then
+      priority=$(sed "$item!d" "$TODO_FILE" | awk -F '\\(|\\)' '{print $2}')
+    fi
+
     if [[ -z "$1" && $TODOTXT_FORCE = 0 ]]; then
         echo -n "Replacement: "
         read input
     else
         input=$*
     fi
+    cleaninput $input
 
+    # If priority isn't set replace, if it is remove priority, replace then add priority again
+    if [ -z $priority ]; then
       sed -i.bak $item" s|^.*|$input|" "$TODO_FILE"
-    [ $TODOTXT_VERBOSE -gt 0 ] && NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
+    else
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "replaced with"
+      sed -i.bak -e "$item s/^(.) //" -e "$item s|^.*|\($priority\) $1|" "$TODO_FILE"
-    [ $TODOTXT_VERBOSE -gt 0 ] && echo "$item: $NEWTODO"
+    fi
+    NEWTODO=$(head -$item "$TODO_FILE" | tail -1)
+    [ $TODOTXT_VERBOSE -gt 0 ] && {
+        echo "$item: $todo"
+        echo "replaced with"
+        echo "$item: $NEWTODO"
+    }
+    [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+        _commit "$item: $todo\nreplaced with\n$item: $NEWTODO" $TODO_FILE
     cleanup;;
 
 "report" )
@@ -851,6 +1137,8 @@ note:  PRIORITY must be anywhere from A to Z."
     echo ${TDONE:-0})
     echo $TECHO >> "$REPORT_FILE"
     [ $TODOTXT_VERBOSE -gt 0 ] && echo "TODO: Report file updated."
+    [ $TODOTXT_GIT_ENABLED -eq 1 ] && \
+        _commit "TODO: Report file updated." $REPORT_FILE
     cat "$REPORT_FILE"
     cleanup;;