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

AUTHORS

@@ -31,6 +31,7 @@ The following submitted code, packages or analysis, and deserve special thanks:
   Mick Koch
   Kathryn Andersen
   Alexander Schremmer
+  Jostein Berntsen
 
 Thanks to the following, who submitted detailed bug reports and excellent
 suggestions:
@@ -61,4 +62,4 @@ suggestions:
   Dirk Deimeke
   Michelle Crane
   Elizabeth Maxson
-
+  Peter De Poorter

ChangeLog

@@ -50,8 +50,8 @@
  + The color.keyword.XXX color rule now applies to annotations too.
  + Importing the same YAML twice now generates an error.
  + Two new color themes (thanks to Kathryn Andersen).
- + More localized holiday files for US, CA, SE, DE, FR, UK, ES and NL
+ + More localized holiday files for US, CA, SE, DE, FR, UK, ES, NL and NO
-   (thanks to T. Charles Yun).
+   (thanks to T. Charles Yun, Jostein Berntsen).
  + Added new 'diagnostics' command to help with bug submission, testing.
  + Fixed bug #427, preventing the task edit command to parse annotation
    dates with spaces.

NEWS

@@ -23,7 +23,7 @@ New Features in taskwarrior 1.9.3
   - Certain characters (#, $, @) are now supported for use in tags.
   - User-controlled color rule precedence.
   - Two new color themes.
-  - New holiday files for US, SE, DE, CA, FR, UK, ES and NL localizations.
+  - New holiday files for US, SE, DE, CA, FR, UK, ES, NL and NO localizations.
   - Task dependencies, and new 'blocked' and 'unblocked' reports for list
     those tasks.
 
@@ -79,6 +79,7 @@ Taskwarrior has been built and tested on the following configurations:
   * Gentoo Linux
   * SliTaz Linux
   * CRUX Linux
+  * SuSE 11.3
   * Solaris 10 and 8
   * OpenBSD 4.5
   * FreeBSD

doc/rc/holidays-NO.rc

@@ -0,0 +1,113 @@
+################################################################################
+# Sample calendar for Norway
+#
+# taskwarrior - a command line task list manager.
+#
+# Copyright 2010, Jostein Berntsen
+# All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the
+#
+#     Free Software Foundation, Inc.,
+#     51 Franklin Street, Fifth Floor,
+#     Boston, MA
+#     02110-1301
+#     USA
+#
+################################################################################
+
+calendar.holidays=sparse
+
+# 2010
+holiday.julaften.name=Julaften
+holiday.julaften.date=20101224
+holiday.juledag.name=Juledag
+holiday.juledag.date=20101225
+holiday.juledag2.name=Juledag
+holiday.juledag2.date=20101226
+holiday.nyttårsaften.name=Nyttårsaften
+holiday.nyttårsaften.date=20101231
+
+# 2011
+holiday.nyttårsdag.name=Nyttårsdag
+holiday.nyttårsdag.date=20110101
+holiday.fastelavn.name=Fastelavn
+holiday.fastelavn.date=20110306
+holiday.palmesøndag.name=Palmesøndag
+holiday.palmesøndag.date=20110417
+holiday.skjærtorsdag.name=Skjærtorsdag
+holiday.skjærtorsdag.date=20110421
+holiday.langfredag.name=Langfredag
+holiday.langfredag.date=20110422
+holiday.påskedag.name=Påskedag
+holiday.påskedag.date=20110424
+holiday.påskedag2.name=Påskedag
+holiday.påskedag2.date=20110425
+holiday.offentlighøytidsdag.name=Offentlig Høytidsdag
+holiday.offentlighøytidsdag.date=20110501
+holiday.frigjøringsdag.name=Frigjøringsdag 1945
+holiday.frigjøringsdag.date=20110508
+holiday.grunnlovsdag.name=Grunnlovsdag
+holiday.grunnlovsdag.date=20110517
+holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag
+holiday.KristiHimmelfartsdag.date=20110602
+holiday.pinsedag.name=Pinsedag
+holiday.pinsedag.date=20110612
+holiday.pinsedag2.name=Pinsedag
+holiday.pinsedag2.date=20110613
+#holiday.julaften.name=Julaften
+#holiday.julaften.date=20111224
+#holiday.juledag.name=Juledag
+#holiday.juledag.date=20111225
+#holiday.juledag2.name=Juledag
+#holiday.juledag2.date=20111226
+#holiday.nyttårsaften.name=Nyttårsaften
+#holiday.nyttårsaften.date=20111231
+
+# 2012
+#holiday.nyttårsdag.name=Nyttårsdag
+#holiday.nyttårsdag.date=20120101
+#holiday.fastelavn.name=Fastelavn
+#holiday.fastelavn.date=20120219
+#holiday.palmesøndag.name=Palmesøndag
+#holiday.palmesøndag.date=20120401
+#holiday.skjærtorsdag.name=Skjærtorsdag
+#holiday.skjærtorsdag.date=20120405
+#holiday.langfredag.name=Langfredag
+#holiday.langfredag.date=20120406
+#holiday.påskedag.name=Påskedag
+#holiday.påskedag.date=20120408
+#holiday.påskedag2.name=Påskedag
+#holiday.påskedag2.date=20120409
+#holiday.offentlighøytidsdag.name=Offentlig Høytidsdag
+#holiday.offentlighøytidsdag.date=20120501
+#holiday.frigjøringsdag.name=Frigjøringsdag 1945
+#holiday.frigjøringsdag.date=20120508
+#holiday.grunnlovsdag.name=Grunnlovsdag
+#holiday.grunnlovsdag.date=20120517
+#holiday.KristiHimmelfartsdag.name=Kristi Himmelfartsdag
+#holiday.KristiHimmelfartsdag.date=20120517
+#holiday.pinsedag.name=Pinsedag
+#holiday.pinsedag.date=20120527
+#holiday.pinsedag2.name=Pinsedag
+#holiday.pinsedag2.date=20120528
+#holiday.julaften.name=Julaften
+#holiday.julaften.date=20121224
+#holiday.juledag.name=Juledag
+#holiday.juledag.date=20121225
+#holiday.juledag2.name=Juledag
+#holiday.juledag2.date=20121226
+#holiday.nyttårsaften.name=Nyttårsaften
+#holiday.nyttårsaften.date=20121231
+

src/API.cpp

@@ -48,6 +48,7 @@
 ////////////////////////////////////////////////////////////////////////////////
 
 #include <algorithm>
+#include <iostream>
 #include "Context.h"
 #include "API.h"
 
@@ -223,7 +224,8 @@ static int api_task_debug_message (lua_State* L)
 static int api_task_exit (lua_State* L)
 {
   // TODO Is this the correct exception?  How does the shell handle this?
-  throw std::string ("Exiting.");
+  std::cout << "Exiting." << std::endl;
+  exit (0); 
   return 0;
 }
 

src/TDB.cpp

@@ -1559,7 +1559,7 @@ void TDB::merge (const std::string& mergeFile)
         {
           std::cout << "Merging new remote task       "
                     << (useColor ? colorAdded.colorize (uuid) : uuid)
-                    << "  \"" << cutOff (tmod.getBefore ().get ("description"), 10) << "\""
+                    << "  \"" << cutOff (tmod.getAfter ().get ("description"), 10) << "\""
                     << "\n";
 
           // remove the \n from composeF4() string

src/report.cpp

@@ -2863,7 +2863,7 @@ std::string onProjectChange (Task& task, bool scope /* = true */)
   if (project != "")
   {
     if (scope)
-      msg << "The scope of project '"
+      msg << "The project '"
           << project
           << "' has changed.  ";
 

src/tests/project.t

@@ -41,26 +41,26 @@ if (open my $fh, '>', 'pro.rc')
 
 # Test the project status numbers.
 my $output = qx{../task rc:pro.rc add one pro:foo};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 0% complete \(1 of 1 tasks remaining\)\./, 'add one');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(1 of 1 tasks remaining\)\./, 'add one');
 
 $output = qx{../task rc:pro.rc add two pro:'foo'};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 0% complete \(2 of 2 tasks remaining\)\./, 'add two');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(2 of 2 tasks remaining\)\./, 'add two');
 
 $output = qx{../task rc:pro.rc add three pro:'foo'};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 0% complete \(3 of 3 tasks remaining\)\./, 'add three');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(3 of 3 tasks remaining\)\./, 'add three');
 
 $output = qx{../task rc:pro.rc add four pro:'foo'};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 0% complete \(4 of 4 tasks remaining\)\./, 'add four');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 0% complete \(4 of 4 tasks remaining\)\./, 'add four');
 
 $output = qx{../task rc:pro.rc 1 done};
 like ($output, qr/Project 'foo' is 25% complete \(3 of 4 tasks remaining\)\./, 'done one');
 
 $output = qx{../task rc:pro.rc 2 delete};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 33% complete \(2 of 3 tasks remaining\)\./, 'delete two');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 33% complete \(2 of 3 tasks remaining\)\./, 'delete two');
 
 $output = qx{../task rc:pro.rc 3 pro:bar};
-like ($output, qr/The scope of project 'foo' has changed\.  Project 'foo' is 50% complete \(1 of 2 tasks remaining\)\./, 'change project');
+like ($output, qr/The project 'foo' has changed\.  Project 'foo' is 50% complete \(1 of 2 tasks remaining\)\./, 'change project');
-like ($output, qr/The scope of project 'bar' has changed\.  Project 'bar' is 0% complete \(1 of 1 tasks remaining\)\./, 'change project');
+like ($output, qr/The project 'bar' has changed\.  Project 'bar' is 0% complete \(1 of 1 tasks remaining\)\./, 'change project');
 
 # Cleanup.
 unlink 'pending.data';