GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-06-26 10:54:26 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'master' into 2.3.0

Browse source 
Conflicts:
	AUTHORS
	CMakeLists.txt
	INSTALL
	NEWS
	cmake.h.in
	doc/man/task-faq.5.in
	package-config/osx/README
	scripts/utils/verify_l10n
	src/API.h
	src/Config.cpp
	src/Context.cpp
	src/DOM.cpp
	src/Hooks.cpp
	src/TransportShell.h
	src/commands/CmdDiagnostics.cpp
	src/commands/CmdShell.cpp
	src/commands/CmdVersion.cpp
	src/en-US.h
	src/shell/Readline.h
	src/wcwidth6.cpp
	test/CMakeLists.txt
	test/color.uda.t
	test/duration.t.cpp
	test/hook.on-launch.t
	test/template.t
	test/uuid.t
This commit is contained in:
Paul Beckingham 2013-04-07 17:51:24 -04:00
commit 8af0a7f3ba
548 changed files with 13752 additions and 2435 deletions
Download patch file Download diff file Expand all files Collapse all files

6
doc/man/task-color.5.in
View file

@ -1,4 +1,4 @@
.TH task-color 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-color 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-color \- A color tutorial for the taskwarrior command line todo manager.
@ -243,7 +243,7 @@ be a visual mess. Beware!
The precedence for the color rules is determined by the configuration
variable 'rule.precedence.color', which by default contains:
due.today,active,blocked,overdue,due,keyword.,project.,tag.,recurring,pri.,tagged,completed,deleted
   due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
These are just the color rules with the 'color.' prefix removed. The
rule 'color.due.today' is the highest precedence, and 'color.deleted' is the lowest.
@ -304,7 +304,7 @@ Better yet, create your own, and share it. We will gladly host the theme file
on <http://taskwarrior.org>.
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
Taskwarrior is distributed under the MIT license. See
http://www.opensource.org/licenses/mit-license.php for more information.

6
doc/man/task-faq.5.in
View file

@ -1,4 +1,4 @@
.TH task-faq 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-faq 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-faq \- A FAQ for the task(1) command line todo manager.
@ -335,7 +335,7 @@ This will remove the second annotation - the first non-exact match.
.B Q: How do I show tasks completed on a certain day?
The day in question has to be boxed by a range, like this:
task end.after:3/29/2012 end.before:3/30/2012 completed
task end.after:3/29/2013 end.before:3/30/2013 completed
Note that a single date, such as 3/29/2012 does not refer to a whole day, but
to a single point in time, 3/20/2012 0:00:00.
@ -355,7 +355,7 @@ There are lots of ways. Here are some:
- Fix bugs
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
Taskwarrior is distributed under the MIT license. See
http://www.opensource.org/licenses/mit-license.php for more information.

6
doc/man/task-sync.5.in
View file

@ -1,4 +1,4 @@
.TH task-sync 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-sync 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-sync \- A tutorial for the task(1) data synchronization capabilities.
@ -352,10 +352,10 @@ unable to merge. The change transactions stored in the undo.data file are
used for synchronization.
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
The sync capabilities were written by J. Schlatow.
Parts copyright (C) 2010 - 2012 J. Schlatow.
Parts copyright (C) 2010 - 2013 J. Schlatow.
Taskwarrior is distributed under the MIT license. See
http://www.opensource.org/licenses/mit-license.php for more information.

47
doc/man/task-tutorial.5.in
View file

@ -1,4 +1,4 @@
.TH task-tutorial 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task-tutorial 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task-tutorial \- A tutorial for the task(1) command line todo manager.
@ -1096,49 +1096,6 @@ ID Project Pri Due Active Age Description
What you see is the result of a set of color rules being applied to the tasks.
There is a hierarchy of color rules that colorize a task based on the metadata.
Here is an example of an explicit override to the color rules where a specific
task is given a red background.
.RS
$ task 1 modify bg:on_red
.br
modified 1 task.
.br
$ task list
.br
.br
ID Project Pri Due Active Age Description
.br
-- ------- --- --- ------ ------- ----------------------------------
.br
1 party H 1 hr Select a free weekend in November
.br
10/16/2010 the 13th looks good
.br
2 party H 1 hr Select and book a venue
.br
5 party H 59 mins Design invitations
.br
8 33 mins Select some Music for after dinner
.br
7 home 50 mins Pay rent at the end of the month
.br
3 party 1 hr Mail invitations
.br
4 party 1 hr Select a caterer
.br
6 party 59 mins Print invitations
.br
.br
8 tasks
.br
$ task 1 modify bg:
.br
Modified 1 task.
.RE
Taskwarrior supports 256 colors on certain terminal emulators, and this shows
the range of colors available. Note that your terminal may show fewer colors.
@ -3124,7 +3081,7 @@ $ task help
.RE
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
This man page was originally written by Federico Hernandez, and has been modified and supplemented by Paul Beckingham.

48
doc/man/task.1.in
View file

@ -1,4 +1,4 @@
.TH task 1 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH task 1 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
task \- A command line todo manager.
@ -144,8 +144,8 @@ Shows a graphical burndown chart, by month.
.B task calendar [due|<month> <year>|<year>] [y]
Shows a monthly calendar with due tasks marked. Shows one horizontal line of
months. If the 'y' argument is provided, will show at least one complete year.
If a year is provided, such as '2012', then that full year is shown. If both
a month and a year are specified ('6 2012') then the months displayed begin at
If a year is provided, such as '2013', then that full year is shown. If both
a month and a year are specified ('6 2013') then the months displayed begin at
the specified month and year. If the 'due' argument is provided, will show
the starting month of the earliest due task.
@ -155,9 +155,10 @@ Displays all possible colors, a named sample, or a legend containing all
currently defined colors.
.TP
.B task columns
.B task columns [substring]
Displays all supported columns and formatting styles. Useful when creating
custom reports.
custom reports. If a substring is provided, only matching column names are
shown.
.TP
.B task <filter> completed
@ -452,7 +453,9 @@ Shows a report of aggregated task status by project.
.TP
.B task <filter> tags
Show a list of all tags used. Any special tags used are highlighted.
Show a list of all tags used. Any special tags used are highlighted. Note that
virtual tags are not listed - they don't really exist, and are just a convenient
notation for other task metadata.
.TP
.B task timesheet [weeks]
@ -488,6 +491,11 @@ Lists all supported configuration variables, for completion purposes.
.B task <filter> _ids
Shows only the IDs of matching tasks, in the form of a list.
.TP
.B task _show
Shows the combined defaults and overrides of the configuration settings, for use
by third-party applications.
.TP
.B task <filter> _uuids
Shows only the UUIDs of matching tasks among all tasks (even deleted and
@ -552,6 +560,27 @@ exempt from all color rules. The supported special tags are:
+nocal This task will not appear on the calendar
+next Elevates task so it appears on 'next' report
There are also virtual tags, which represent task metadata in tag form. These
tags do not exist, but can be used to filter tasks. The supported virtual tags
are:
BLOCKED Matches if the task is blocked
UNBLOCKED Matches if the task is not blocked
BLOCKING Matches if the task is blocking
DUE Matches if the task is due
DUETODAY Matches if the task is due today
TODAY Matches if the task is due today
OVERDUE Matches if the task is overdue
ACTIVE Matches if the task is started
SCHEDULED Matches if the task is scheduled
CHILD Matches if the task has a parent
UNTIL Matches if the task expires
WAITING Matches if the task is waiting
ANNOTATED Matches if the task has annotations
You can use +BLOCKED to filter blocked tasks, or -BLOCKED for unblocked tasks.
Similarly, -BLOCKED is equivalent to +UNBLOCKED.
.TP
.B project:<project-name>
Specifies the project to which a task is related to.
@ -789,7 +818,7 @@ task ... due:7/14/2008
.TP
ISO-8601
task ... due:20120314T223000Z
task ... due:20130314T223000Z
.TP
Relative wording
@ -973,7 +1002,8 @@ Taskwarrior stores its configuration in a file in the user's home directory:
.B task rc:<path-to-alternate-file> ...
Specifies an alternate configuration file.
.TP TASKRC=/tmp/.taskrc task ..
.TP
.B TASKRC=/tmp/.taskrc task ..
The environment variable overrides the default and the command line
specification of the .taskrc file.
@ -1030,7 +1060,7 @@ The file that contains the completed ("done") tasks.
The file that contains information needed by the "undo" and "merge" commands.
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
Taskwarrior is distributed under the MIT license. See
http://www.opensource.org/licenses/mit-license.php for more information.

22
doc/man/taskrc.5.in
View file

@ -1,4 +1,4 @@
.TH taskrc 5 2012-09-18 "${PACKAGE_STRING}" "User Manuals"
.TH taskrc 5 2013-04-07 "${PACKAGE_STRING}" "User Manuals"
.SH NAME
taskrc \- Configuration file for the task(1) command
@ -347,6 +347,11 @@ May be yes or no, and determines whether the 'tags' command lists all the tag
names you have used, or just the ones used in active tasks. The default value is
"no".
.TP
.B print.empty.columns=no
May be yes or no, and determines whether columns with no data for any task are
printed. Defaults to no.
.TP
.B search.case.sensitive=yes
May be yes or no, and determines whether keyword lookup and substitutions on the
@ -504,7 +509,7 @@ D two-digit day, for example 01 or 30
.br
M two-digit month, for example 01 or 12
.br
Y four-digit year, for example 2009 or 2012
Y four-digit year, for example 2009 or 2013
.br
a short name of weekday, for example Mon or Wed
.br
@ -584,9 +589,9 @@ field that is set. Otherwise, they are set to the corresponding values of
.RS
.RS
.br
8/1/2012 with m/d/Y implies August 1, 2012 at midnight (inferred)
8/1/2013 with m/d/Y implies August 1, 2013 at midnight (inferred)
.br
8/1 20:40 with m/d H:N implies August 1, 2012 (inferred) at 20:40
8/1 20:40 with m/d H:N implies August 1, 2013 (inferred) at 20:40
.RE
.RE
@ -841,6 +846,11 @@ Colors any task assigned to project X.
Colors any task where the description or any annotation contains X.
.RE
.TP
.B color.uda.X=on green
Colors any taks that has the user defined attribute X.
.RE
.TP
.B color.error=green
Colors any of the error messages.
@ -964,7 +974,7 @@ Colors the output of the merge command.
.RE
.TP
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,recurring,pri,tagged,completed,deleted
.B rule.precedence.color=due.today,active,blocking,blocked,overdue,due,scheduled,keyword.,project.,tag.,uda.,recurring,pri.,tagged,completed,deleted
.RS
This setting specifies the precedence of the color rules, from highest to
lowest. Note that the prefix 'color.' is omitted (for brevity), and that any
@ -1334,7 +1344,7 @@ of a task.
.RE
.SH "CREDITS & COPYRIGHTS"
Copyright (C) 2006 \- 2012 P. Beckingham, F. Hernandez.
Copyright (C) 2006 \- 2013 P. Beckingham, F. Hernandez.
This man page was originally written by Federico Hernandez.