From 27d6407493c581fdc58f9d6d380b73b70716058b Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Sat, 15 Oct 2011 23:02:01 -0400 Subject: [PATCH] Bulk - Modified the meaning of 'rc.bulk'. The old meaning was: the largest number of tasks that could be modified without confirmation. New meaning is: the number of tasks that trigger bulk confirmation. Default was 2 (meaning that 2 tasks affected were not in need of confirmation), is now 3 (meaning 3 tasks now trigger confirmation. Despite the dog's dinner I made of the preceding statement, the configuration variable is now easier to understand. --- doc/man/taskrc.5.in | 4 ++-- src/Config.cpp | 2 +- test/bug.bulk.t | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/man/taskrc.5.in b/doc/man/taskrc.5.in index 4bebce712..769c3be67 100644 --- a/doc/man/taskrc.5.in +++ b/doc/man/taskrc.5.in @@ -271,8 +271,8 @@ Controls left and right padding around each row of the report output. Default i Controls padding between columns of the report output. Default is "1". .TP -.B bulk=2 -Is a number, defaulting to 2. When more than this number of tasks are modified +.B bulk=3 +Is a number, defaulting to 3. When this number or greater tasks are modified in a single command, confirmation will be required, unless the .B confirmation variable is "no". diff --git a/src/Config.cpp b/src/Config.cpp index 56b0327b5..cb67462f4 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -89,7 +89,7 @@ std::string Config::_defaults = "indent.report=0 # Indent spaces for whole report\n" "row.padding=0 # Left and right padding for each row of report\n" "column.padding=1 # Spaces between each column in a report\n" - "bulk=2 # > 2 tasks considered 'a lot', for confirmation\n" + "bulk=3 # 3 or more tasks considered a bulk change and is confirmed\n" "nag=You have more urgent tasks. # Nag message to keep you honest\n" // TODO "search.case.sensitive=yes # Setting to no allows case insensitive searches\n" "active.indicator=* # What to show as an active task indicator\n" diff --git a/test/bug.bulk.t b/test/bug.bulk.t index 2cc03a3dc..d8a392d97 100755 --- a/test/bug.bulk.t +++ b/test/bug.bulk.t @@ -35,7 +35,7 @@ if (open my $fh, '>', 'bulk.rc') { print $fh "data.location=.\n", "confirmation=yes\n", - "bulk=2\n"; + "bulk=3\n"; close $fh; ok (-r 'bulk.rc', 'Created bulk.rc'); }