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

Copyright

Browse Source 
- Fixed typo in copyright.
- Added 'merge.autopush' as a valid config variable.
This commit is contained in:
Paul Beckingham
2010-09-01 22:26:09 -04:00
parent 2eaba55481
commit 4d46be0767
3 changed files with 87 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Transport.cpp
View File

@@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager. // taskwarrior - a command line task list manager.
// //
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. // Copyright 2010, Johannes Schlatow.
// All rights reserved. // All rights reserved.
// //
// This program is free software; you can redistribute it and/or modify it under // This program is free software; you can redistribute it and/or modify it under
@@ -152,3 +152,6 @@ int Transport::execute()
return child_status; return child_status;
} }
} }
////////////////////////////////////////////////////////////////////////////////

4
src/TransportSSH.cpp
View File

@@ -1,7 +1,7 @@
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// taskwarrior - a command line task list manager. // taskwarrior - a command line task list manager.
// //
// Copyright 2006 - 2010, Paul Beckingham, Johannes Schlatow. // Copyright 2010, Johannes Schlatow.
// All rights reserved. // All rights reserved.
// //
// This program is free software; you can redistribute it and/or modify it under // This program is free software; you can redistribute it and/or modify it under
@@ -128,3 +128,5 @@ void TransportSSH::recv(std::string target)
if (execute()) if (execute())
throw std::string ("Failed to run scp!"); throw std::string ("Failed to run scp!");
} }
////////////////////////////////////////////////////////////////////////////////

45
src/command.cpp
View File

@@ -796,23 +796,25 @@ int handleShow (std::string &outs)
// search for whole words. // search for whole words.
std::string recognized = std::string recognized =
" annotations blanklines bulk calendar.details calendar.details.report " " annotations blanklines bulk calendar.details calendar.details.report "
"calendar.holidays calendar.legend color color.active color.due color.due.today " "calendar.holidays calendar.legend color color.active color.due "
"color.blocked color.overdue color.pri.H color.pri.L color.pri.M color.pri.none " "color.due.today color.blocked color.overdue color.pri.H color.pri.L "
"color.recurring color.tagged color.footnote color.header color.debug " "color.pri.M color.pri.none color.recurring color.tagged color.footnote "
"color.alternate color.calendar.today color.calendar.due color.calendar.due.today " "color.header color.debug color.alternate color.calendar.today "
"color.calendar.overdue color.calendar.weekend color.calendar.holiday " "color.calendar.due color.calendar.due.today color.calendar.overdue "
"color.calendar.weeknumber color.summary.background color.summary.bar " "color.calendar.weekend color.calendar.holiday color.calendar.weeknumber "
"color.history.add color.history.done color.history.delete color.undo.before " "color.summary.background color.summary.bar color.history.add "
"color.undo.after confirmation curses data.location dateformat dateformat.holiday " "color.history.done color.history.delete color.undo.before "
"dateformat.report dateformat.annotation debug default.command " "color.undo.after confirmation curses data.location dateformat "
"default.priority default.project defaultwidth due locale displayweeknumber " "dateformat.holiday dateformat.report dateformat.annotation debug "
"export.ical.class echo.command fontunderline locking monthsperline nag next " "default.command default.priority default.project defaultwidth due "
"journal.time journal.time.start.annotation journal.time.stop.annotation " "locale displayweeknumber export.ical.class echo.command fontunderline "
"project shadow.command shadow.file shadow.notify weekstart editor " "locking monthsperline nag next journal.time "
"import.synonym.id import.synonym.uuid complete.all.projects complete.all.tags " "journal.time.start.annotation journal.time.stop.annotation project "
"search.case.sensitive hooks active.indicator tag.indicator recurrence.indicator " "shadow.command shadow.file shadow.notify weekstart editor "
"recurrence.limit list.all.projects list.all.tags undo.style verbose " "import.synonym.id import.synonym.uuid complete.all.projects "
"rule.precedence.color " "complete.all.tags search.case.sensitive hooks active.indicator "
"tag.indicator recurrence.indicator recurrence.limit list.all.projects "
"list.all.tags undo.style verbose rule.precedence.color merge.autopush "
#ifdef FEATURE_SHELL #ifdef FEATURE_SHELL
"shell.prompt " "shell.prompt "
#endif #endif
@@ -821,10 +823,11 @@ int handleShow (std::string &outs)
"import.synonym.end import.synonym.project import.synonym.priority " "import.synonym.end import.synonym.project import.synonym.priority "
"import.synonym.fg import.synonym.bg import.synonym.description " "import.synonym.fg import.synonym.bg import.synonym.description "
"urgency.next.coefficient urgency.blocking.coefficient urgency.blocked.coefficient " "urgency.next.coefficient urgency.blocking.coefficient "
"urgency.due.coefficient urgency.priority.coefficient urgency.waiting.coefficient " "urgency.blocked.coefficient urgency.due.coefficient "
"urgency.active.coefficient urgency.project.coefficient urgency.tags.coefficient " "urgency.priority.coefficient urgency.waiting.coefficient "
"urgency.annotations.coefficient "; "urgency.active.coefficient urgency.project.coefficient "
"urgency.tags.coefficient urgency.annotations.coefficient ";
// This configuration variable is supported, but not documented. It exists // This configuration variable is supported, but not documented. It exists
// so that unit tests can force color to be on even when the output from task // so that unit tests can force color to be on even when the output from task