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

Merge branch '1.4.3' of git@github.com:pbeckingham/task into 1.4.3

Browse Source 
Conflicts:
	ChangeLog
	html/task.html
	src/task.cpp
This commit is contained in:
Paul Beckingham
2008-11-02 21:50:55 -05:00
parent b0e18de1b6 47ffc0babc
commit ce42ae9622
35 changed files with 620 additions and 258 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/task.cpp
View File

@@ -183,10 +183,6 @@ static void shortUsage (Config& conf)
table.addCell (row, 1, "task stats");
table.addCell (row, 2, "Shows task database statistics");
row = table.addRow ();
table.addCell (row, 1, "task usage");
table.addCell (row, 2, "Shows task command usage frequency");
row = table.addRow ();
table.addCell (row, 1, "task export");
table.addCell (row, 2, "Exports all tasks as a CSV file");
@@ -304,10 +300,6 @@ int main (int argc, char** argv)
std::string dataLocation = expandPath (conf.get ("data.location"));
tdb.dataDirectory (dataLocation);
// Log commands, if desired.
if (conf.get ("command.logging") == "on")
tdb.logCommand (argc, argv);
// Set up TDB callback.
std::string shadowFile = expandPath (conf.get ("shadow.file"));
if (shadowFile != "")
@@ -785,7 +777,6 @@ std::string runTaskCommand (
else if (command == "start") { out = handleStart (tdb, task, conf); }
else if (command == "undo") { out = handleUndo (tdb, task, conf); }
else if (command == "stats") { out = handleReportStats (tdb, task, conf); }
else if (command == "usage") { out = handleReportUsage (tdb, task, conf); }
else if (command == "list") { if (gc) tdb.gc (); out = handleList (tdb, task, conf); }
else if (command == "long") { if (gc) tdb.gc (); out = handleLongList (tdb, task, conf); }
else if (command == "ls") { if (gc) tdb.gc (); out = handleSmallList (tdb, task, conf); }