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

src/Config.cpp

@@ -357,7 +357,7 @@ std::string Config::_defaults =
   "report.active.columns=id,project,priority,due,start.active,entry.age,description\n"
   "report.active.labels=ID,Proj,Pri,Due,Active,Age,Description\n"
   "report.active.sort=due+,priority-,project+\n"
-  "report.active.filter=status:pending start.any:\n"
+  "report.active.filter=status:pending +ACTIVE\n"
   "\n"
   "report.completed.description=Lists completed tasks\n"
   "report.completed.columns=end,project,priority,entry.age,description,uuid\n"
@@ -369,13 +369,13 @@ std::string Config::_defaults =
   "report.recurring.columns=id,project,priority,due,recur,start.active,entry.age,description\n"
   "report.recurring.labels=ID,Proj,Pri,Due,Recur,Active,Age,Description\n"
   "report.recurring.sort=due+,priority-,start-,project+\n"
-  "report.recurring.filter=status:pending parent.any:\n"
+  "report.recurring.filter=status:pending +CHILD\n"
   "\n"
   "report.waiting.description=Lists all waiting tasks\n"
   "report.waiting.columns=id,project,priority,wait,entry.age,description\n"
   "report.waiting.labels=ID,Proj,Pri,Wait,Age,Description\n"
   "report.waiting.sort=wait+,priority-,project+\n"
-  "report.waiting.filter=status:waiting\n"
+  "report.waiting.filter=+WAITING\n"
   "\n"
   "report.all.description=Lists all pending and completed tasks\n"
   "report.all.columns=id,status,project,priority,due,end,start.active,entry.age,description\n"
@@ -393,7 +393,7 @@ std::string Config::_defaults =
   "report.ready.columns=id,project,priority,due,start.active,entry.age,urgency,description\n"
   "report.ready.labels=ID,Proj,Pri,Due,A,Age,Urg,Description\n"
   "report.ready.sort=urgency-,due+,priority-,start-,project+\n"
-  "report.ready.filter=status:pending limit:page wait.none: '(scheduled.none: or scheduled.before:now )'\n"
+  "report.ready.filter=status:pending limit:page -WAITING '(scheduled.none: or scheduled.before:now )'\n"
   "\n"
   "report.blocked.description=Lists all blocked tasks\n"
   "report.blocked.columns=id,depends,project,priority,due,start.active,entry.age,description\n"

src/Config.h

@@ -2,7 +2,6 @@
 // taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

src/Socket.h

@@ -24,6 +24,7 @@
 // http://www.opensource.org/licenses/mit-license.php
 //
 ////////////////////////////////////////////////////////////////////////////////
+
 #ifndef INCLUDED_SOCKET
 #define INCLUDED_SOCKET
 

src/columns/ColUrgency.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <Context.h>
 #include <ColUrgency.h>
 #include <text.h>

src/commands/CmdVersion.cpp

@@ -89,7 +89,7 @@ int CmdVersion::execute (std::string& output)
 #elif defined (LINUX)
       << "linux"
 #elif defined (KFREEBSD)
-         "gnu-kfreebsd"
+      << "gnu-kfreebsd"
 #elif defined (GNUHURD)
       << "gnu-hurd"
 #else

src/i18n.h

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 ////////////////////////////////////////////////////////////////////////////////
 //
 // Strings that should be localized:

test/config.t.cpp

@@ -2,7 +2,6 @@
 // taskwarrior - a command line task list manager.
 //
 // Copyright 2006 - 2013, Paul Beckingham, Federico Hernandez.
-// All rights reserved.
 //
 // Permission is hereby granted, free of charge, to any person obtaining a copy
 // of this software and associated documentation files (the "Software"), to deal

test/json.t.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <JSON.h>
 #include <test.h>

test/json_test.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <string.h>
 #include <File.h>

test/path.t.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <Context.h>
 #include <Path.h>
 #include <test.h>

test/view.t.cpp

@@ -25,7 +25,6 @@
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-
 #include <iostream>
 #include <unistd.h>
 #include <stdio.h>