GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-28 04:27:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Paul Beckingham 2010-10-31 10:59:22 -04:00
commit 5ba23a4ecd
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Config.cpp
View file

@ -274,8 +274,8 @@ std::string Config::defaults =
"alias.export=export.yaml # Prefer YAML over CSV or iCal export\n" "alias.export=export.yaml # Prefer YAML over CSV or iCal export\n"
"alias.export.vcalendar=export.ical # They are the same\n" "alias.export.vcalendar=export.ical # They are the same\n"
"\n" "\n"
"# Fields: id, uuid, project, priority, priority_long, entry, start, end, due\n" "# Fields: id, uuid, project, priority, priority_long, entry, start, end,\n"
"# countdown, countdown_compact, age, age_compact, active, tags,\n" "# due, countdown, countdown_compact, age, age_compact, active, tags,\n"
"# depends, description_only, description, recur, recurrence_indicator,\n" "# depends, description_only, description, recur, recurrence_indicator,\n"
"# tag_indicator, wait.\n" "# tag_indicator, wait.\n"
"# Description: This report is ...\n" "# Description: This report is ...\n"

3
src/command.cpp
View file

@ -804,7 +804,7 @@ int handleVersion (std::string& outs)
link.setColumnJustification (0, Table::left); link.setColumnJustification (0, Table::left);
link.addCell (link.addRow (), 0, link.addCell (link.addRow (), 0,
"Documentation for taskwarrior can be found using 'man task', 'man taskrc', " "Documentation for taskwarrior can be found using 'man task', 'man taskrc', "
"'man task-tutorial', 'man task-color', 'man task-faq' or at " "'man task-tutorial', 'man task-color', 'man task-sync', 'man task-faq' or at "
"http://taskwarrior.org"); "http://taskwarrior.org");
Color bold ("bold"); Color bold ("bold");
@ -1728,7 +1728,6 @@ int handleModify (std::string& outs)
// Either we scan context.task for negative IDs "depends:-n" // Either we scan context.task for negative IDs "depends:-n"
// or we ask deltaAttributes (above) to record dependency // or we ask deltaAttributes (above) to record dependency
// removal. // removal.
if (1)
dependencyChainOnModify (before, *other); dependencyChainOnModify (before, *other);
context.tdb.update (*other); context.tdb.update (*other);

16
src/report.cpp
View file

@ -203,6 +203,18 @@ int shortUsage (std::string& outs)
table.addCell (row, 1, "task export"); table.addCell (row, 1, "task export");
table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv"); table.addCell (row, 2, "Lists all tasks in CSV format. Alias to export.csv");
row = table.addRow ();
table.addCell (row, 1, "task export.csv");
table.addCell (row, 2, "Lists all tasks in CSV format.");
row = table.addRow ();
table.addCell (row, 1, "task export.ical");
table.addCell (row, 2, "Lists all tasks in iCalendar format.");
row = table.addRow ();
table.addCell (row, 1, "task export.yaml");
table.addCell (row, 2, "Lists all tasks in YAML format.");
row = table.addRow (); row = table.addRow ();
table.addCell (row, 1, "task merge URL"); table.addCell (row, 1, "task merge URL");
table.addCell (row, 2, "Merges the specified undo.data file with the local data files."); table.addCell (row, 2, "Merges the specified undo.data file with the local data files.");
@ -215,10 +227,6 @@ int shortUsage (std::string& outs)
table.addCell (row, 1, "task pull URL"); table.addCell (row, 1, "task pull URL");
table.addCell (row, 2, "Overwrites the local *.data files with those found at the URL."); table.addCell (row, 2, "Overwrites the local *.data files with those found at the URL.");
row = table.addRow ();
table.addCell (row, 1, "task export.ical");
table.addCell (row, 2, "Lists all tasks in iCalendar format.");
row = table.addRow (); row = table.addRow ();
table.addCell (row, 1, "task color [sample | legend]"); table.addCell (row, 1, "task color [sample | legend]");
table.addCell (row, 2, "Displays all possible colors, a named sample, or a " table.addCell (row, 2, "Displays all possible colors, a named sample, or a "