Merge branch '1.9.4' of tasktools.org:task into 1.9.4

ChangeLog

@@ -35,6 +35,7 @@
  + Added feature #629, a new holiday configuration file for New Zealand
    (thanks to Stephen Haywood).
  + Added feature #638, a wait:later possibility (thanks to Clément Bœsch).
+ + Added feature #46, proper sortable age column.
  + Added new holiday configuration file for Italy (thanks to Nicola Busanello).
  + Added new holiday configuration file for Austria (thanks to Andreas Poisel).
  + Eliminated dependency on ncurses.

doc/man/taskrc.5.in

@@ -445,6 +445,12 @@ a D b Y (V)  would do an output as "Fri 24 Jul 2009 (30)"
 A, B D, Y    would do an output as "Friday, July 24, 2009"
 .br
 vV a Y-M-D   would do an output as "v30 Fri 2009-07-24"
+.br
+yMD.HN       would do an output as "110124.2342"
+.br
+m/d/Y H:N    would do an output as "1/24/2011 10:42"
+.br
+a D b Y H:N:S would do and output as "Mon 24 Jan 2011 11:19:42"
 .RE
 .RE
 

test/bug.656.t

@@ -0,0 +1,72 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 6;
+
+# Create the rc file.
+if (open my $fh, '>', 'bug.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=no\n";
+  close $fh;
+  ok (-r 'bug.rc', 'Created bug.rc');
+}
+
+# Bug 656: Recurring task continually spawns new tasks
+
+# Setup: Add a pair of recurring tasks
+qx{../src/task rc:bug.rc add First recurring task due:tomorrow rec:daily};
+qx{../src/task rc:bug.rc add Second recurring task due:tomorrow rec:daily};
+
+# Bug describes that each time task is executed, another child task of the
+# Second recurring task is created.
+
+qx{../src/task rc:bug.rc ls};
+
+
+# Result: Check for an extra task the second time task ls is executed
+my $output = qx{../src/task rc:bug.rc ls};
+unlike   ($output, qr/^\s3\s*Second recurring task\s*$/ms, 'Extra task detected.');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'completed.data';
+ok (!-r 'completed.data', 'Removed completed.data');
+
+unlink 'undo.data';
+ok (!-r 'undo.data', 'Removed undo.data');
+
+unlink 'bug.rc';
+ok (!-r 'bug.rc', 'Removed bug.rc');
+
+exit 0;
+

test/bug.c001.t

@@ -0,0 +1,68 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+## All rights reserved.
+##
+## This program is free software; you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free Software
+## Foundation; either version 2 of the License, or (at your option) any later
+## version.
+##
+## This program is distributed in the hope that it will be useful, but WITHOUT
+## ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+## FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+## details.
+##
+## You should have received a copy of the GNU General Public License along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 6;
+
+# Create the rc file.
+if (open my $fh, '>', 'bug.rc')
+{
+  print $fh "data.location=.\n",
+            "confirmation=no\n";
+  close $fh;
+  ok (-r 'bug.rc', 'Created bug.rc');
+}
+
+# Unreported Bug c01: Entering two recurring tasks back to back fails to increment
+# the ID returned to the user
+#
+# First noticed in 1.9.4 commit 2d50d1c
+
+# Setup: Add a recurring task
+qx{../src/task rc:bug.rc add First recurring task due:tomorrow rec:daily};
+
+# Result: Ensure the second recurring task has an ID of 2
+my $output = qx{../src/task rc:bug.rc add Second recurring task due:tomorrow rec:daily};
+like   ($output, qr/Created task 2\./ms, 'Recurring task assigned correct ID.');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'completed.data';
+ok (!-r 'completed.data', 'Removed completed.data');
+
+unlink 'undo.data';
+ok (!-r 'undo.data', 'Removed undo.data');
+
+unlink 'bug.rc';
+ok (!-r 'bug.rc', 'Removed bug.rc');
+
+exit 0;
+