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

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

Browse Source
This commit is contained in:
Owen Clarke
2012-07-26 22:11:05 +10:00
parent 276971675a 0a00f3cde4
commit c20ce334f9
14 changed files with 38 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/commands/CmdAnnotate.cpp
View File

@@ -117,10 +117,10 @@ int CmdAnnotate::execute (std::string& output)
else
{
std::cout << STRING_CMD_ANNO_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
// Now list the project changes.

6
src/commands/CmdAppend.cpp
View File

@@ -117,10 +117,10 @@ int CmdAppend::execute (std::string& output)
else
{
std::cout << STRING_CMD_APPEND_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
// Now list the project changes.

6
src/commands/CmdDelete.cpp
View File

@@ -141,10 +141,10 @@ int CmdDelete::execute (std::string& output)
else
{
std::cout << STRING_CMD_DELETE_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
else
{

6
src/commands/CmdDenotate.cpp
View File

@@ -130,10 +130,10 @@ int CmdDenotate::execute (std::string& output)
else
{
std::cout << STRING_CMD_DENO_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
else
{

7
src/commands/CmdDone.cpp
View File

@@ -99,7 +99,6 @@ int CmdDone::execute (std::string& output)
++count;
feedback_affected (STRING_CMD_DONE_TASK, *task);
feedback_unblocked (*task);
context.tdb2.modify (*task);
if (!nagged)
nagged = nag (*task);
dependencyChainOnComplete (*task);
@@ -109,10 +108,10 @@ int CmdDone::execute (std::string& output)
else
{
std::cout << STRING_CMD_DONE_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
else
{

6
src/commands/CmdDuplicate.cpp
View File

@@ -123,10 +123,10 @@ int CmdDuplicate::execute (std::string& output)
else
{
std::cout << STRING_CMD_DUPLICATE_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
// Now list the project changes.

6
src/commands/CmdModify.cpp
View File

@@ -160,10 +160,10 @@ int CmdModify::execute (std::string& output)
else
{
std::cout << STRING_CMD_MODIFY_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
}

6
src/commands/CmdPrepend.cpp
View File

@@ -117,10 +117,10 @@ int CmdPrepend::execute (std::string& output)
else
{
std::cout << STRING_CMD_PREPEND_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
// Now list the project changes.

6
src/commands/CmdStart.cpp
View File

@@ -102,10 +102,10 @@ int CmdStart::execute (std::string& output)
else
{
std::cout << STRING_CMD_START_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
else
{

6
src/commands/CmdStop.cpp
View File

@@ -98,10 +98,10 @@ int CmdStop::execute (std::string& output)
else
{
std::cout << STRING_CMD_STOP_NO << "\n";
rc = 1;
rc = 1;
if (_permission_quit)
break;
}
if (_permission_quit)
break;
}
else
{

2
src/rules.cpp
View File

@@ -273,7 +273,7 @@ static void colorizeCompleted (Task& task, const Color& base, Color& c)
////////////////////////////////////////////////////////////////////////////////
static void colorizeDeleted (Task& task, const Color& base, Color& c)
{
if (task.getStatus () == Task::completed)
if (task.getStatus () == Task::deleted)
c.blend (base);
}