diff --git a/ChangeLog b/ChangeLog index 554a0d367..dc6e244a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,7 @@ 2.1.2 (2012-09-18) 1e3176ed70d2b50faf03838d0df279b2a4ae93b2 Bugs + + Fix bug #1056, where CmdSummary did not print abstract parents. + Bug fix release regarding #1104, which causes duplicate UUIDs during the merge command. + Fixed bug where shadow files are not properly created when there is a missing diff --git a/src/commands/CmdSummary.cpp b/src/commands/CmdSummary.cpp index 741705495..0ec6b5326 100644 --- a/src/commands/CmdSummary.cpp +++ b/src/commands/CmdSummary.cpp @@ -27,6 +27,7 @@ #define L10N // Localization complete. +#include #include #include #include @@ -130,11 +131,25 @@ int CmdSummary::execute (std::string& output) Color bg_color (context.config.get ("color.summary.background")); int barWidth = 30; + std::vector processed; std::map ::iterator i; for (i = allProjects.begin (); i != allProjects.end (); ++i) { if (countPending[i->first] > 0) { + const std::vector parents = extractParents (i->first); + std::vector ::const_iterator parent; + for (parent = parents.begin (); parent != parents.end (); parent++) + { + if (std::find (processed.begin (), processed.end (), *parent) + == processed.end ()) + { + int row = view.addRow (); + view.set (row, 0, indentProject (*parent)); + processed.push_back (*parent); + } + } + int row = view.addRow (); view.set (row, 0, (i->first == "" ? STRING_CMD_SUMMARY_NONE @@ -165,6 +180,7 @@ int CmdSummary::execute (std::string& output) char percent[12]; sprintf (percent, "%d%%", 100 * c / (c + p)); view.set (row, 3, percent); + processed.push_back (i->first); } } diff --git a/test/bug.1056.t b/test/bug.1056.t new file mode 100755 index 000000000..7235fe0d5 --- /dev/null +++ b/test/bug.1056.t @@ -0,0 +1,136 @@ +#! /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 => 9; + +# Create the rc file. +if (open my $fh, '>', 'bug.1056') +{ + print $fh "data.location=.\n", + "confirmation=off\n"; + close $fh; + ok (-r 'bug.1056', 'Created pro.rc'); +} + +# Bug 1056: Project indentation in CmdSummary. +qx{../src/task rc:bug.1056 add testing project:existingParent 2>&1 >/dev/null}; +qx{../src/task rc:bug.1056 add testing project:existingParent.child 2>&1 >/dev/null}; +qx{../src/task rc:bug.1056 add testing project:abstractParent.kid 2>&1 >/dev/null}; +qx{../src/task rc:bug.1056 add testing project:.myProject 2>&1 >/dev/null}; +qx{../src/task rc:bug.1056 add testing project:myProject. 2>&1 >/dev/null}; +qx{../src/task rc:bug.1056 add testing project:.myProject. 2>&1 >/dev/null}; + +my $output = qx{../src/task rc:bug.1056 summary 2>&1}; +my @lines = split ('\n',$output); + +# It's easier to make a pattern for the end than the beginning because +# project names can have spaces. +my $project_name_column; +if ($lines[4] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[4]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^\.myProject\s*$/, '\'.myProject\' not indented'); + +if ($lines[5] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[5]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^\.myProject\.\s*$/, '\'.myProject.\' not indented'); + +if ($lines[6] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = "error"; +} +else +{ + $project_name_column = $lines[6]; +} +like ($project_name_column, qr/^abstractParent\s*$/, 'abstract parent not indented and no priority columns'); + +if ($lines[7] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[7]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^ kid\s*$/, 'child indented and without parent name'); + +if ($lines[8] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[8]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^existingParent\s*$/, 'existing parent not indented and has priority columns'); + +if ($lines[9] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[9]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^ child\s*$/, 'child of existing parent indented and without parent name'); + +if ($lines[10] =~ s/\s+\d+\s+-\s+\d+%$//) +{ + $project_name_column = $lines[10]; +} +else +{ + $project_name_column = "error"; +} +like ($project_name_column, qr/^myProject\.\s*$/, '\'myProject.\' not indented'); + +# Cleanup. +unlink qw(pending.data completed.data undo.data backlog.data synch.key bug.1056); +ok (! -r 'pending.data' && + ! -r 'completed.data' && + ! -r 'undo.data' && + ! -r 'backlog.data' && + ! -r 'synch.key' && + ! -r 'bug.1056', 'Cleanup'); + +exit 0; +