GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Make virtual tags consistent across commands.

Browse source 
- the DUETODAY tag was deprecated in b2d49f397
- the QUARTER tag was added in 630a1530e and 4711dd9e1
- the PROJECT, PRIORITY and LATEST tags were added in 4008a64

Note: the documentation in the man page is already up-to-date.

Fixes #2359
This commit is contained in:
Max Rossmannek 2020-12-01 23:56:04 +01:00 • committed by Tomas Babej
parent 4663ca840f
commit 3d850715f4
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/commands/CmdInfo.cpp
View file

@ -333,13 +333,17 @@ int CmdInfo::execute (std::string& output)
if (task.hasTag ("COMPLETED")) virtualTags += "COMPLETED "; if (task.hasTag ("COMPLETED")) virtualTags += "COMPLETED ";
if (task.hasTag ("DELETED")) virtualTags += "DELETED "; if (task.hasTag ("DELETED")) virtualTags += "DELETED ";
if (task.hasTag ("DUE")) virtualTags += "DUE "; if (task.hasTag ("DUE")) virtualTags += "DUE ";
if (task.hasTag ("DUETODAY")) virtualTags += "DUETODAY "; if (task.hasTag ("DUETODAY")) virtualTags += "DUETODAY "; // 2016-03-29: Deprecated in 2.6.0
if (task.hasTag ("INSTANCE")) virtualTags += "INSTANCE "; if (task.hasTag ("INSTANCE")) virtualTags += "INSTANCE ";
if (task.hasTag ("LATEST")) virtualTags += "LATEST ";
if (task.hasTag ("MONTH")) virtualTags += "MONTH "; if (task.hasTag ("MONTH")) virtualTags += "MONTH ";
if (task.hasTag ("ORPHAN")) virtualTags += "ORPHAN "; if (task.hasTag ("ORPHAN")) virtualTags += "ORPHAN ";
if (task.hasTag ("OVERDUE")) virtualTags += "OVERDUE "; if (task.hasTag ("OVERDUE")) virtualTags += "OVERDUE ";
if (task.hasTag ("PARENT")) virtualTags += "PARENT "; // 2017-01-07: Deprecated in 2.6.0 if (task.hasTag ("PARENT")) virtualTags += "PARENT "; // 2017-01-07: Deprecated in 2.6.0
if (task.hasTag ("PENDING")) virtualTags += "PENDING "; if (task.hasTag ("PENDING")) virtualTags += "PENDING ";
if (task.hasTag ("PRIORITY")) virtualTags += "PRIORITY ";
if (task.hasTag ("PROJECT")) virtualTags += "PROJECT";
if (task.hasTag ("QUARTER")) virtualTags += "QUARTER";
if (task.hasTag ("READY")) virtualTags += "READY "; if (task.hasTag ("READY")) virtualTags += "READY ";
if (task.hasTag ("SCHEDULED")) virtualTags += "SCHEDULED "; if (task.hasTag ("SCHEDULED")) virtualTags += "SCHEDULED ";
if (task.hasTag ("TAGGED")) virtualTags += "TAGGED "; if (task.hasTag ("TAGGED")) virtualTags += "TAGGED ";
@ -353,9 +357,6 @@ int CmdInfo::execute (std::string& output)
if (task.hasTag ("WEEK")) virtualTags += "WEEK "; if (task.hasTag ("WEEK")) virtualTags += "WEEK ";
if (task.hasTag ("YEAR")) virtualTags += "YEAR "; if (task.hasTag ("YEAR")) virtualTags += "YEAR ";
if (task.hasTag ("YESTERDAY")) virtualTags += "YESTERDAY "; if (task.hasTag ("YESTERDAY")) virtualTags += "YESTERDAY ";
if (task.hasTag ("LATEST")) virtualTags += "LATEST ";
if (task.hasTag ("PROJECT")) virtualTags += "PROJECT ";
if (task.hasTag ("PRIORITY")) virtualTags += "PRIORITY ";
// If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well. // If you update the above list, update src/commands/CmdInfo.cpp and src/commands/CmdTags.cpp as well.
row = view.addRow (); row = view.addRow ();

6
src/commands/CmdTags.cpp
View file

@ -188,13 +188,17 @@ int CmdCompletionTags::execute (std::string& output)
unique["COMPLETED"] = 0; unique["COMPLETED"] = 0;
unique["DELETED"] = 0; unique["DELETED"] = 0;
unique["DUE"] = 0; unique["DUE"] = 0;
unique["DUETODAY"] = 0; unique["DUETODAY"] = 0; // 2016-03-29: Deprecated in 2.6.0
unique["INSTANCE"] = 0; unique["INSTANCE"] = 0;
unique["LATEST"] = 0;
unique["MONTH"] = 0; unique["MONTH"] = 0;
unique["ORPHAN"] = 0; unique["ORPHAN"] = 0;
unique["OVERDUE"] = 0; unique["OVERDUE"] = 0;
unique["PARENT"] = 0; // 2017-01-07: Deprecated in 2.6.0 unique["PARENT"] = 0; // 2017-01-07: Deprecated in 2.6.0
unique["PENDING"] = 0; unique["PENDING"] = 0;
unique["PRIORITY"] = 0;
unique["PROJECT"] = 0;
unique["QUARTER"] = 0;
unique["READY"] = 0; unique["READY"] = 0;
unique["SCHEDULED"] = 0; unique["SCHEDULED"] = 0;
unique["TAGGED"] = 0; unique["TAGGED"] = 0;