gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Task: CHILD, INSTANCE, PARENT and TEMPLATE are now forward/backward compatible

Browse Source
This commit is contained in:
Paul Beckingham
2017-03-23 22:51:11 -04:00
parent 1858de5f51
commit 60bccaae2b
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Task.cpp
View File

@@ -1262,7 +1262,7 @@ bool Task::hasTag (const std::string& tag) const
#ifdef PRODUCT_TASKWARRIOR #ifdef PRODUCT_TASKWARRIOR
if (tag == "READY") return is_ready (); if (tag == "READY") return is_ready ();
if (tag == "DUE") return is_due (); if (tag == "DUE") return is_due ();
if (tag == "DUETODAY") return is_duetoday (); // 2016-03-29: Deprecated in 2.6.0 if (tag == "DUETODAY") return is_duetoday (); // 2016-03-29: Deprecated in 2.6.0
if (tag == "TODAY") return is_duetoday (); if (tag == "TODAY") return is_duetoday ();
if (tag == "YESTERDAY") return is_dueyesterday (); if (tag == "YESTERDAY") return is_dueyesterday ();
if (tag == "TOMORROW") return is_duetomorrow (); if (tag == "TOMORROW") return is_duetomorrow ();
@@ -1274,13 +1274,13 @@ bool Task::hasTag (const std::string& tag) const
#endif #endif
if (tag == "ACTIVE") return has ("start"); if (tag == "ACTIVE") return has ("start");
if (tag == "SCHEDULED") return has ("scheduled"); if (tag == "SCHEDULED") return has ("scheduled");
if (tag == "CHILD") return has ("parent"); // 2017-01-07: Deprecated in 2.6.0 if (tag == "CHILD") return has ("parent") || has ("template"); // 2017-01-07: Deprecated in 2.6.0
if (tag == "INSTANCE") return has ("template"); if (tag == "INSTANCE") return has ("template") || has ("parent");
if (tag == "UNTIL") return has ("until"); if (tag == "UNTIL") return has ("until");
if (tag == "ANNOTATED") return hasAnnotations (); if (tag == "ANNOTATED") return hasAnnotations ();
if (tag == "TAGGED") return has ("tags"); if (tag == "TAGGED") return has ("tags");
if (tag == "PARENT") return has ("mask"); // 2017-01-07: Deprecated in 2.6.0 if (tag == "PARENT") return has ("mask") || has ("last"); // 2017-01-07: Deprecated in 2.6.0
if (tag == "TEMPLATE") return has ("last"); if (tag == "TEMPLATE") return has ("last") || has ("mask");
if (tag == "WAITING") return get ("status") == "waiting"; if (tag == "WAITING") return get ("status") == "waiting";
if (tag == "PENDING") return get ("status") == "pending"; if (tag == "PENDING") return get ("status") == "pending";
if (tag == "COMPLETED") return get ("status") == "completed"; if (tag == "COMPLETED") return get ("status") == "completed";