GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-05 14:07:21 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Feature

Browse source 
- Allow UUIDs and IDs range when modifying task dependencies.
- Update man page.
- Add unit tests.
- Fatorize code when adding and removing dependencies in Task.cpp.
This commit is contained in:
Louis-Claude Canon 2012-05-05 10:22:05 +02:00 • committed by Paul Beckingham
parent 5ffb65b5ac
commit 1364202d30
5 changed files with 72 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/Task.cpp
View file

@ -767,32 +767,16 @@ void Task::removeAnnotations ()
////////////////////////////////////////////////////////////////////////////////
void Task::addDependency (int id)
{
if (id == this->id)
throw std::string (STRING_TASK_DEPEND_ITSELF);
// Check that id is resolvable.
std::string uuid = context.tdb2.pending.uuid (id);
if (uuid == "")
throw format (STRING_TASK_DEPEND_MISSING, id);
throw format (STRING_TASK_DEPEND_MISS_CREA, id);
// Store the dependency.
std::string depends = get ("depends");
if (depends != "")
{
// Check for extant dependency.
if (depends.find (uuid) == std::string::npos)
set ("depends", depends + "," + uuid);
else
throw format (STRING_TASK_DEPEND_DUP, this->id, id);
}
else
set ("depends", uuid);
if (depends.find (uuid) != std::string::npos)
throw format (STRING_TASK_DEPEND_DUP, this->id, id);
// Prevent circular dependencies.
if (dependencyIsCircular (*this))
throw std::string (STRING_TASK_DEPEND_CIRCULAR);
recalc_urgency = true;
addDependency(uuid);
}
////////////////////////////////////////////////////////////////////////////////
@ -849,11 +833,12 @@ void Task::removeDependency (const std::string& uuid)
////////////////////////////////////////////////////////////////////////////////
void Task::removeDependency (int id)
{
std::string depends = get ("depends");
std::string uuid = context.tdb2.pending.uuid (id);
if (uuid != "")
if (uuid != "" && depends.find (uuid) != std::string::npos)
removeDependency (uuid);
else
throw std::string (STRING_TASK_DEPEND_NO_UUID);
throw format (STRING_TASK_DEPEND_MISS_DEL, id);
}
////////////////////////////////////////////////////////////////////////////////