Merge branch '2.3.0' into 2.4.0

Conflicts: AUTHORS CMakeLists.txt NEWS src/A3.cpp src/CMakeLists.txt src/Config.cpp src/Duration.cpp src/Duration.h src/Nibbler.cpp src/Nibbler.h src/RX.cpp src/RX.h src/columns/ColDate.cpp src/columns/ColScheduled.cpp src/commands/Command.cpp src/legacy.cpp src/utf8.cpp src/utf8.h test/CMakeLists.txt test/bug.mergedeps.t.postponed test/duration.t.cpp test/merge.duplicates.t test/merge.simple_duplication.t test/merge.t test/nibbler.t.cpp test/roundtrip.t test/rx.t.cpp test/utf8.t.cpp
2025-08-19 00:43:07 +02:00 · 2014-01-07 19:10:03 -05:00 · 2014-01-07 19:10:03 -05:00 · 98f740e9d1
commit 98f740e9d1
parent ab0d929a3c c4ecf613ac
550 changed files with 6129 additions and 2976 deletions
--- a/scripts/add-ons/export-csv.pl
+++ b/scripts/add-ons/export-csv.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-html.pl
+++ b/scripts/add-ons/export-html.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-ical.pl
+++ b/scripts/add-ons/export-ical.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-sql.py
+++ b/scripts/add-ons/export-sql.py
@ -2,7 +2,7 @@
 ###############################################################################
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-tsv.pl
+++ b/scripts/add-ons/export-tsv.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-xml.pl
+++ b/scripts/add-ons/export-xml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-xml.py
+++ b/scripts/add-ons/export-xml.py
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-xml.rb
+++ b/scripts/add-ons/export-xml.rb
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-yad.pl
+++ b/scripts/add-ons/export-yad.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/export-yaml.pl
+++ b/scripts/add-ons/export-yaml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/import-todo.sh.pl
+++ b/scripts/add-ons/import-todo.sh.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/import-yaml.pl
+++ b/scripts/add-ons/import-yaml.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
--- a/scripts/add-ons/update-holidays.pl
+++ b/scripts/add-ons/update-holidays.pl
@ -2,7 +2,7 @@
 ################################################################################
 ## taskwarrior - a command line task list manager.
 ##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 ##
 ## Permission is hereby granted, free of charge, to any person obtaining a copy
 ## of this software and associated documentation files (the "Software"), to deal
@ -190,7 +190,7 @@ if (open my $fh, '>:utf8', $file)
        "# ${url_current}\n",
        "# ${url_next}\n",
        "#\n",
-        "# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.\n",
+        "# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.\n",
        "#\n",
        "# Permission is hereby granted, free of charge, to any person obtaining a copy\n",
        "# of this software and associated documentation files (the \"Software\"), to deal\n",
--- a/scripts/bash/task.sh
+++ b/scripts/bash/task.sh
@ -2,7 +2,7 @@
 # bash completion support for taskwarrior
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
+# Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/scripts/fish/task.fish
+++ b/scripts/fish/task.fish
@ -12,7 +12,7 @@
 #  * Tags
 #  * Attribute names and modifiers
 #
-#  Copyright 2009 - 2013 Mick Koch <kchmck@gmail.com>
+#  Copyright 2009 - 2014 Mick Koch <kchmck@gmail.com>
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
--- a/scripts/utils/l10n
+++ b/scripts/utils/l10n
@ -0,0 +1,172 @@
+#! /usr/bin/env python -tt
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006-2014, Paul Beckingham, Federico Hernandez.
+##
+## Permission is hereby granted, free of charge, to any person obtaining a copy
+## of this software and associated documentation files (the "Software"), to deal
+## in the Software without restriction, including without limitation the rights
+## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+## copies of the Software, and to permit persons to whom the Software is
+## furnished to do so, subject to the following conditions:
+##
+## The above copyright notice and this permission notice shall be included
+## in all copies or substantial portions of the Software.
+##
+## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+## SOFTWARE.
+##
+## http://www.opensource.org/licenses/mit-license.php
+##
+################################################################################
+
+from __future__ import print_function
+from __future__ import unicode_literals
+
+import os
+import sys
+import argparse
+import re
+import fnmatch
+
+def find_localizations(source):
+  '''Finds all [a-z][a-z]-[A-Z][A-Z].h files in the source tree.'''
+  found = []
+  for path, dirs, files in os.walk(source, topdown=True, onerror=None, followlinks=False):
+    found.extend(map(lambda x: os.path.join(path, x),
+                 fnmatch.filter(files, '[a-z][a-z]-[A-Z][A-Z].h')))
+  return found
+
+def read_file(translations, file):
+  '''Reads all the localized strings from a file.'''
+  translations[file] = {}
+  with open(file, 'r') as fh:
+    for match in re.findall(r'^\s*#define\s+(STRING_[^\s]+)(\s|\\)+"([^"]*)"', fh.read(), re.MULTILINE):
+      translations[file][match[0]] = match[2]
+
+def is_present(translations, file, string):
+  '''Determines if the string is defined in a translation.'''
+  return string in translations[file]
+
+def used_in_source(source, string):
+  '''Determines if the string is used in the source.'''
+  command = "git grep %s %s | grep -v [a-z][a-z]-[A-Z][A-Z].h >/dev/null 2>&1" % (string, source)
+  return True if os.system(command) == 0 else False
+
+def is_translated(translations, file, string):
+  '''Determines whether the string is the same in the base version as in the
+     translation, indicating work needed.'''
+  if file == base:
+    return True
+  elif string not in translations[base]:
+    return True
+  elif string not in translations[file]:
+    return False
+  else:
+    return bool(translations[file][string] != translations[base][string])
+
+def main(args):
+  '''Processes all the localized files.'''
+  errors = 0
+  translations = {}
+
+  for file in args.files:
+    # Verify all files exist.
+    if not os.path.exists(file):
+      raise Exception("Localized file '%s' not readable." % file)
+    read_file(translations, file)
+
+  strings = set()
+  for file in translations:
+    for string in translations[file]:
+      strings.add(string)
+
+  if len(strings) == 0:
+    if not args.quiet:
+      print("There are no localized strings found.")
+    errors = 1
+
+  # Get length of longest string ID.
+  longest_string = len(max(strings, key=len))
+
+  # Display info.
+  if not args.quiet:
+    print('Scanning in', args.source)
+    print()
+
+  # Print header line.
+  files = map(lambda x: os.path.basename(x), args.files)
+  if not args.quiet:
+    print('%-*s %s' % (longest_string, 'String ID', ' '.join(files)))
+    print('-' * longest_string, ' '.join(['-------'] * len(files)))
+
+  for string in sorted(strings):
+    # assess status of 'string':
+    # - clean
+
+    line = ''
+    line_errors = 0
+    for file in args.files:
+      message = '        '
+      if is_present(translations, file, string):
+        if is_translated(translations, file, string):
+          message = ' [30;42mOk     [0m'
+        else:
+          message = ' [30;43mTODO   [0m'
+      else:
+        message = ' [37;41mMissing[0m'
+        line_errors = 1
+
+      line += message
+
+    if args.all or line_errors != 0:
+      if args.search:
+        if used_in_source(args.source, string):
+          if not args.quiet:
+            print('%-*s' % (longest_string, string), line, sep='')
+        else:
+          if not args.quiet:
+            print('[37;41m%-*s[0m' % (longest_string, string), line, sep='')
+          line_errors = 1
+      else:
+        if not args.quiet:
+          print('%-*s' % (longest_string, string), line, sep='')
+
+    if line_errors:
+      errors = 1
+
+  if not args.quiet:
+    print('-' * longest_string, ' '.join(['-------'] * len(files)))
+    print('%-*s' % (longest_string, 'Total'), end='')
+    for file in args.files:
+      print('%8d' % len(translations[file]), end='')
+    print()
+
+  sys.exit(errors)
+
+if __name__ == "__main__":
+  usage="""Utility for checking localized string status across translations."""
+
+  parser = argparse.ArgumentParser(description=usage)
+  parser.add_argument('--source', action='store', required=True, help='The source code tree.')
+  parser.add_argument('--all', action='store_true', help='Show all string IDs.')
+  parser.add_argument('--search', action='store_true', help='Search source for use.')
+  parser.add_argument('--quiet', action='store_true', help='Produces no output.')
+  args = parser.parse_args()
+
+  if args.source:
+    args.files = find_localizations(args.source)
+
+  base = filter(lambda x: x.endswith('en-US.h'), args.files)[0]
+
+  try:
+    main(args)
+  except Exception as msg:
+    print('Error:', msg)
+
--- a/scripts/utils/verify_l10n
+++ b/scripts/utils/verify_l10n
@ -1,59 +0,0 @@
-#!/usr/bin/env python
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included
-## in all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-## SOFTWARE.
-##
-## http://www.opensource.org/licenses/mit-license.php
-##
-################################################################################
-
-import sys
-import re
-
-if len(sys.argv) < 3:
-    print "Usage:", sys.argv[0], "file1 file2 ..."
-    sys.exit()
-
-translations = {}
-missing = {}
-for file in sys.argv[1:]:
-    with open(file, 'r') as f:
-        translations[file] = set()
-        missing[file] = set()
-        # Treat empty strings ("") as a missing entry - because they are just that.
-        for m in re.findall(r'^\s*#define\s(STRING_[^\s]+)(\s|\\)+"([^"]+)"', f.read(), re.MULTILINE):
-            translations[file].add(m[0])
-
-for file in translations:
-    for entry in translations[file]:
-        for other_translation in translations:
-            if entry not in translations[other_translation]:
-                missing[other_translation].add(entry)
-
-for file in missing:
-    if len(missing[file]) > 0:
-        print "--- %s --- missing defines:" % file
-        for i in sorted(list(missing[file])):
-            print i
-    else:
-        print "--- %s --- is ok." % file
-
--- a/scripts/utils/verify_strings
+++ b/scripts/utils/verify_strings
@ -1,57 +0,0 @@
-#! /usr/bin/perl
-################################################################################
-## taskwarrior - a command line task list manager.
-##
-## Copyright 2006-2013, Paul Beckingham, Federico Hernandez.
-##
-## Permission is hereby granted, free of charge, to any person obtaining a copy
-## of this software and associated documentation files (the "Software"), to deal
-## in the Software without restriction, including without limitation the rights
-## to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-## copies of the Software, and to permit persons to whom the Software is
-## furnished to do so, subject to the following conditions:
-##
-## The above copyright notice and this permission notice shall be included
-## in all copies or substantial portions of the Software.
-##
-## THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-## OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-## FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
-## THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-## LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-## OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-## SOFTWARE.
-##
-## http://www.opensource.org/licenses/mit-license.php
-##
-################################################################################
-
-use strict;
-use warnings;
-
-# Use the en-US.h file, or whatever was specified on the command line.
-my $file = scalar @ARGV ? shift @ARGV : 'en-US.h';
-
-# Find all the defined strings.
-my @strings;
-if (open my $fh, '<', $file)
-{
-  while (my $line = <$fh>)
-  {
-    push @strings, $1 if $line =~ /\#define\s+(STRING_\S+)/;
-  }
-
-  close $fh;
-}
-
-# Recursively search for all the defined strings, reporting those that are not
-# used.
-for my $string (@strings)
-{
-  print "$string is not used\n"
-    if `git grep $string | grep -v [a-z][a-z]-[A-Z][A-Z].h` eq '';
-}
-
-exit 0;
-
-################################################################################
--- a/scripts/vim/README
+++ b/scripts/vim/README
@ -53,7 +53,7 @@ You should then be ready to go.
 ---
 All four above mentioned files are

-Copyright 2009 - 2013 John Florian
+Copyright 2009 - 2014 John Florian

 and are available under the MIT license.
 For the full text of this license, see COPYING.
--- a/scripts/vim/ftdetect/task.vim
+++ b/scripts/vim/ftdetect/task.vim
@ -4,7 +4,7 @@
 " Maintainer:   John Florian <jflorian@doubledog.org>
 " Updated:	Thu Dec 10 18:28:26 EST 2009
 "
-" Copyright 2009 - 2013 John Florian
+" Copyright 2009 - 2014 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskdata.vim
+++ b/scripts/vim/syntax/taskdata.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
 "
-" Copyright 2009 - 2013 John Florian
+" Copyright 2009 - 2014 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskedit.vim
+++ b/scripts/vim/syntax/taskedit.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Wed Jul  8 19:46:32 EDT 2009
 "
-" Copyright 2009 - 2013 John Florian
+" Copyright 2009 - 2014 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/vim/syntax/taskrc.vim
+++ b/scripts/vim/syntax/taskrc.vim
@ -3,7 +3,7 @@
 " Maintainer:	John Florian <jflorian@doubledog.org>
 " Updated:	Sat Feb 20 14:14:44 EST 2010
 "
-" Copyright 2009 - 2013 John Florian
+" Copyright 2009 - 2014 John Florian
 "
 " This file is available under the MIT license.
 " For the full text of this license, see COPYING.
--- a/scripts/zsh/_task
+++ b/scripts/zsh/_task
@ -3,7 +3,7 @@
 #
 # taskwarrior - a command line task list manager.
 #
-# Copyright 2010 - 2013 Johannes Schlatow
+# Copyright 2010 - 2014 Johannes Schlatow
 # Copyright 2009 P.C. Shyamshankar
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
@ -98,11 +98,13 @@ _regex_words values 'task dates' \
 	'soww:Start of work week' \
 	'socw:Start of calendar week' \
 	'som:Start of month' \
+	'soq:Start of quarter' \
 	'soy:Start of year' \
 	'eow:End of week' \
 	'eoww:End of work week' \
 	'eocw:End of calendar week' \
 	'eom:End of month' \
+	'eoq:End of quarter' \
 	'eoy:End of year' \
 	'mon:Monday' \
 	'tue:Tuesday'\
@ -110,7 +112,16 @@ _regex_words values 'task dates' \
 	'thu:Thursday' \
 	'fri:Friday' \
 	'sat:Saturday' \
-	'sun:Sunday'
+	'sun:Sunday' \
+  'good*friday:Good Friday' \
+  'easter:Easter' \
+  'eastermonday:Easter Monday' \
+  'ascension:Ascension' \
+  'pentecost:Pentecost' \
+  'midsommar:Midsommar' \
+  'midsommarafton:Midsommarafton' \
+  'later:Later' \
+  'someday:Some Day'
 _task_dates=("$reply[@]")

 local -a _task_reldates
@ -141,7 +152,7 @@ _regex_words values 'task frequencies' \
 	'weekly:Every week' \
 	'biweekly:Every two weeks' \
 	'fortnight:Every two weeks' \
-   'monthly:Every month' \
+  'monthly:Every month' \
 	'quarterly:Every three months' \
 	'semiannual:Every six months' \
 	'annual:Every year' \