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

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

Browse Source
This commit is contained in:
Cory Donnelly
2011-01-21 15:16:46 -05:00
parent f820e7a8be cc0b0b00af
commit 5317703dcc
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/command.cpp
View File

@@ -599,7 +599,6 @@ int handleQuery (std::string& outs)
// Note: "limit:" feature not supported. // Note: "limit:" feature not supported.
// Compose output. // Compose output.
outs = "[";
std::vector <Task>::iterator t; std::vector <Task>::iterator t;
for (t = tasks.begin (); t != tasks.end (); ++t) for (t = tasks.begin (); t != tasks.end (); ++t)
{ {
@@ -609,8 +608,7 @@ int handleQuery (std::string& outs)
outs += t->composeJSON (); outs += t->composeJSON ();
} }
outs += "]\n"; outs += "\n";
context.hooks.trigger ("post-query-command"); context.hooks.trigger ("post-query-command");
} }

12
src/edit.cpp
View File

@@ -145,13 +145,15 @@ static std::string formatTask (Task task)
join (allTags, " ", tags); join (allTags, " ", tags);
if (verbose) if (verbose)
before << "# Separate the tags with spaces, like this: tag1 tag2\n" before << "# Separate the tags with spaces, like this: tag1 tag2\n";
<< " Tags: " << allTags << "\n"
<< "# The description field is allowed to wrap and use multiple lines. Task\n" before << " Tags: " << allTags << "\n";
if (verbose)
before << "# The description field is allowed to wrap and use multiple lines. Task\n"
<< "# will combine them.\n"; << "# will combine them.\n";
before << " Tags: " << allTags << "\n" before << " Description: " << task.get ("description") << "\n"
<< " Description: " << task.get ("description") << "\n"
<< " Created: " << formatDate (task, "entry") << "\n" << " Created: " << formatDate (task, "entry") << "\n"
<< " Started: " << formatDate (task, "start") << "\n" << " Started: " << formatDate (task, "start") << "\n"
<< " Ended: " << formatDate (task, "end") << "\n" << " Ended: " << formatDate (task, "end") << "\n"