GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-04 10:37:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Task

Browse source 
- When no modifications are provided, but are expected, complain.
This commit is contained in:
Paul Beckingham 2014-05-26 15:18:30 -04:00
parent bc1c7a6695
commit a119b4c7c3
1 changed files with 16 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/Task.cpp
View file

@ -1944,6 +1944,7 @@ void Task::modify (modType type)
context.debug ("Task::modify"); context.debug ("Task::modify");
std::string label = " MODIFICATION "; std::string label = " MODIFICATION ";
int modCount = 0;
std::vector <Tree*>::iterator i; std::vector <Tree*>::iterator i;
for (i = tree->_branches.begin (); i != tree->_branches.end (); ++i) for (i = tree->_branches.begin (); i != tree->_branches.end (); ++i)
{ {
@ -1960,6 +1961,7 @@ void Task::modify (modType type)
// Remove attribute if the value is blank. // Remove attribute if the value is blank.
(*this).remove (name); (*this).remove (name);
context.debug (label + name + " <-- ''"); context.debug (label + name + " <-- ''");
++modCount;
} }
else else
{ {
@ -2002,6 +2004,8 @@ void Task::modify (modType type)
else else
addDependency (*id); addDependency (*id);
} }
++modCount;
} }
// Dates are special, maybe. // Dates are special, maybe.
@ -2019,6 +2023,7 @@ void Task::modify (modType type)
// TODO If v is duration and < 5y, add to now, else store as date. // TODO If v is duration and < 5y, add to now, else store as date.
// TODO Not sure if the above still holds true. // TODO Not sure if the above still holds true.
set (name, v.get_date ()); set (name, v.get_date ());
++modCount;
} }
// Special case: type duration. // Special case: type duration.
// Durations too. // Durations too.
@ -2039,6 +2044,7 @@ void Task::modify (modType type)
v.cast (Variant::type_duration); v.cast (Variant::type_duration);
v.cast (Variant::type_string); v.cast (Variant::type_string);
set (name, v); set (name, v);
++modCount;
} }
// Need handling for numeric types, used by UDAs. // Need handling for numeric types, used by UDAs.
@ -2056,6 +2062,7 @@ void Task::modify (modType type)
v.cast (Variant::type_real); v.cast (Variant::type_real);
v.cast (Variant::type_string); v.cast (Variant::type_string);
set (name, v); set (name, v);
++modCount;
} }
// Try to use modify method, otherwise just continue to the final option. // Try to use modify method, otherwise just continue to the final option.
@ -2068,6 +2075,7 @@ void Task::modify (modType type)
std::string col_value = column->modify (value); std::string col_value = column->modify (value);
context.debug (label + name + " <-- " + col_value + " <-- " + value); context.debug (label + name + " <-- " + col_value + " <-- " + value);
(*this).set (name, col_value); (*this).set (name, col_value);
++modCount;
} }
else else
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
@ -2079,6 +2087,7 @@ void Task::modify (modType type)
{ {
context.debug (label + name + " <-- " + value); context.debug (label + name + " <-- " + value);
(*this).set (name, value); (*this).set (name, value);
++modCount;
} }
else else
throw format (STRING_INVALID_MOD, name, value); throw format (STRING_INVALID_MOD, name, value);
@ -2096,6 +2105,7 @@ void Task::modify (modType type)
substitute ((*i)->attribute ("from"), substitute ((*i)->attribute ("from"),
(*i)->attribute ("to"), (*i)->attribute ("to"),
((*i)->attribute ("global") == "1")); ((*i)->attribute ("global") == "1"));
++modCount;
} }
// Tags need special handling because they are essentially a vector stored // Tags need special handling because they are essentially a vector stored
@ -2115,6 +2125,8 @@ void Task::modify (modType type)
context.debug (label + "tags <-- remove '" + tag + "'"); context.debug (label + "tags <-- remove '" + tag + "'");
removeTag (tag); removeTag (tag);
} }
++modCount;
} }
// WORD and TERMINATED args are accumulated. // WORD and TERMINATED args are accumulated.
@ -2163,6 +2175,10 @@ void Task::modify (modType type)
break; break;
} }
} }
else if (modCount == 0)
{
throw std::string (STRING_CMD_MODIFY_NEED_TEXT);
}
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////