From 46c031c45c24dea51aeb65d6de1fa63cf77b2b93 Mon Sep 17 00:00:00 2001 From: Paul Beckingham Date: Thu, 28 Oct 2010 21:46:26 -0400 Subject: [PATCH] Documentation - The help command now includes the task-sync man page. - The help command now includes export.csv and export.yaml. --- src/Config.cpp | 4 ++-- src/command.cpp | 5 ++--- src/report.cpp | 18 +++++++++++++----- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/src/Config.cpp b/src/Config.cpp index f8b8a29ae..7c972a1de 100644 --- a/src/Config.cpp +++ b/src/Config.cpp @@ -274,8 +274,8 @@ std::string Config::defaults = "alias.export=export.yaml # Prefer YAML over CSV or iCal export\n" "alias.export.vcalendar=export.ical # They are the same\n" "\n" - "# Fields: id, uuid, project, priority, priority_long, entry, start, end, due\n" - "# countdown, countdown_compact, age, age_compact, active, tags,\n" + "# Fields: id, uuid, project, priority, priority_long, entry, start, end,\n" + "# due, countdown, countdown_compact, age, age_compact, active, tags,\n" "# depends, description_only, description, recur, recurrence_indicator,\n" "# tag_indicator, wait.\n" "# Description: This report is ...\n" diff --git a/src/command.cpp b/src/command.cpp index 6791b9bef..4a0058ddf 100644 --- a/src/command.cpp +++ b/src/command.cpp @@ -804,7 +804,7 @@ int handleVersion (std::string& outs) link.setColumnJustification (0, Table::left); link.addCell (link.addRow (), 0, "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"); Color bold ("bold"); @@ -1728,8 +1728,7 @@ int handleModify (std::string& outs) // Either we scan context.task for negative IDs "depends:-n" // or we ask deltaAttributes (above) to record dependency // removal. - if (1) - dependencyChainOnModify (before, *other); + dependencyChainOnModify (before, *other); context.tdb.update (*other); diff --git a/src/report.cpp b/src/report.cpp index cc1728a9e..a18d0a7d3 100644 --- a/src/report.cpp +++ b/src/report.cpp @@ -203,6 +203,18 @@ int shortUsage (std::string& outs) table.addCell (row, 1, "task export"); 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 (); table.addCell (row, 1, "task merge URL"); table.addCell (row, 2, "Merges the specified undo.data file with the local data files."); @@ -210,15 +222,11 @@ int shortUsage (std::string& outs) row = table.addRow (); table.addCell (row, 1, "task push URL"); table.addCell (row, 2, "Pushes the local *.data files to the URL."); - + row = table.addRow (); table.addCell (row, 1, "task pull 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 (); table.addCell (row, 1, "task color [sample | legend]"); table.addCell (row, 2, "Displays all possible colors, a named sample, or a "