diff --git a/ChangeLog b/ChangeLog index fb0b67bfe..e062b9268 100644 --- a/ChangeLog +++ b/ChangeLog @@ -12,12 +12,14 @@ Features + Virtual tags. Bugs + + Fixed bug #1065, where CmdShow issued messages in incorrect situations. + + Fixed bug #1060, where an error was not thrown correctly. + Fixed bug #1043, where aliases were not recognized by bash autocompletion. + Fixed bug #1038, which prints blank lines with bulk changes and when the verbose attributes does not specify it. Lines do a better separation between each changes also. + Fixed bug #1042, where the 'diagnostics' command failed to detect missing - external utilities on Solaris and NetBSD + external utilities on Solaris and NetBSD. + Fixed bug #1044, where 'task projects' considers newly deleted tasks and provides an incorrect summary. + Fixed bug #1048, which segfaulted rather than complain about syntax (thanks @@ -28,7 +30,7 @@ Bugs 2.1.1 (2012-07-24) 46c5f8b826838ce96d9df7fcd3039de3c43483dd Bugs - + Fixed bug that caused miplaced commas in JSON export (thanks to greenskeleton). + + Fixed bug that caused misplaced commas in JSON export (thanks to greenskeleton). + Fixed bug #1036, which prevents 'until' attributes to be modified for non-recurring tasks (thanks to Stéphane Pezennec). @@ -54,9 +56,9 @@ Features + Performance improvements: + Added parse-free convenience functions + Filter optimization: with no 'OR' or 'XOR' operators, no UUIDS but with IDs - the completed.data file is not referenced + the completed.data file is not referenced. + Reduced excessive number of sort columns on certain reports - + Speed boost for 'next' report + + Speed boost for 'next' report. + Similar helper subcommands for 'uuids' as for there is for 'ids' (_uuids and _zshuuids). + Possible to specify the date format when editing with 'dateformat.edit'. diff --git a/src/commands/CmdShow.cpp b/src/commands/CmdShow.cpp index e75ddab7d..a33638f9d 100644 --- a/src/commands/CmdShow.cpp +++ b/src/commands/CmdShow.cpp @@ -264,6 +264,9 @@ int CmdShow::execute (std::string& output) Color error ("bold white on red"); Color warning ("black on yellow"); + bool issue_error = false; + bool issue_warning = false; + std::string section; // Look for the first plausible argument which could be a pattern @@ -281,9 +284,15 @@ int CmdShow::execute (std::string& output) // Look for unrecognized. Color color; if (std::find (unrecognized.begin (), unrecognized.end (), *i) != unrecognized.end ()) + { + issue_error = true; color = error; + } else if (std::find (default_values.begin (), default_values.end (), *i) != default_values.end ()) + { + issue_warning = true; color = warning; + } std::string value = context.config.get (*i); // hide sensible information @@ -307,7 +316,7 @@ int CmdShow::execute (std::string& output) << (view.rows () == 0 ? STRING_CMD_SHOW_NONE : "") << (view.rows () == 0 ? "\n\n" : "\n"); - if (default_values.size ()) + if (issue_warning) { out << STRING_CMD_SHOW_DIFFER; @@ -318,7 +327,7 @@ int CmdShow::execute (std::string& output) } // Display the unrecognized variables. - if (unrecognized.size ()) + if (issue_error) { out << STRING_CMD_SHOW_UNREC << "\n"; diff --git a/test/bug.1065.t b/test/bug.1065.t new file mode 100755 index 000000000..c1cd2429a --- /dev/null +++ b/test/bug.1065.t @@ -0,0 +1,79 @@ +#! /usr/bin/env perl +################################################################################ +## taskwarrior - a command line task list manager. +## +## Copyright 2006-2012, Paul Beckingham, Federico Hernandez. +## +## Permission is hereby granted, free of charge, to any person obtaining a copy +## of this software and associated documentation files (the "Software"), to deal +## in the Software without restriction, including without limitation the rights +## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +## copies of the Software, and to permit persons to whom the Software is +## furnished to do so, subject to the following conditions: +## +## The above copyright notice and this permission notice shall be included +## in all copies or substantial portions of the Software. +## +## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +## SOFTWARE. +## +## http://www.opensource.org/licenses/mit-license.php +## +################################################################################ + +use strict; +use warnings; +use Test::More tests => 14; + +# Create the rc file. +if (open my $fh, '>', 'bug.rc') +{ + print $fh "data.location=.\n"; + print $fh "alias.xyzzyx=status:waiting\n"; + print $fh "imnotrecognized=kai\n"; + + close $fh; + ok (-r 'bug.rc', 'Created bug.rc'); +} + +# Bug 1065 - CmdShow should not display the differ message if no non-default in matched elements. +my $output = qx{../src/task rc:bug.rc show alias 2>&1}; +ok ($? == 0, 'Exit status check'); +like ($output, qr/Some of your .taskrc variables differ from the default values./, 'Message is shown when non-default matches in pattern'); + +$output = qx{../src/task rc:bug.rc show 2>&1}; +ok ($? == 0, 'Exit status check'); +like ($output, qr/Some of your .taskrc variables differ from the default values./, 'Message is shown when non-default matches in all'); + +$output = qx{../src/task rc:bug.rc show report.overdue 2>&1}; +ok ($? == 0, 'Exit status check'); +unlike ($output, qr/Some of your .taskrc variables differ/, 'Message is not shown when no non-default matches in pattern'); + +# Bug 1065 - CmdShow should not display the unrecognized message if no non-default in matched elements. +my $output = qx{../src/task rc:bug.rc show notrecog 2>&1}; +ok ($? == 0, 'Exit status check'); +like ($output, qr/Your .taskrc file contains these unrecognized variables:/, 'Message is shown when unrecognized matches in pattern'); + +$output = qx{../src/task rc:bug.rc show 2>&1}; +ok ($? == 0, 'Exit status check'); +like ($output, qr/Your .taskrc file contains these unrecognized variables:/, 'Message is shown when unrecognized matches in all'); + +$output = qx{../src/task rc:bug.rc show report.overdue 2>&1}; +ok ($? == 0, 'Exit status check'); +unlike ($output, qr/unrecognized variables/, 'Message is not shown when no non-default matches in pattern'); + +# Cleanup. +unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.rc); +ok (! -r 'pending.data' && + ! -r 'completed.data' && + ! -r 'undo.data' && + ! -r 'backlog.data' && + ! -r 'synch.key' && + ! -r 'bug.rc', 'Cleanup'); + +exit 0;