cmake: Bump project version to 2.6.1

This bumps libshared version to the one not suffering from
misidentification of certain ID ranges.

Closes #2639.

CMakeLists.txt

@@ -9,7 +9,7 @@ set (HAVE_CMAKE true)
 project (task)
 include (CXXSniffer)
 
-set (PROJECT_VERSION "2.6.0")
+set (PROJECT_VERSION "2.6.1")
 
 OPTION (ENABLE_WASM "Enable 'wasm' support" OFF)
 

ChangeLog

@@ -1,4 +1,26 @@
-2.6.0 () -
+2.6.1 () -
+
+- TW #2619 Fish autocompletion fails when completing tag removal
+           Thanks to Alexandre Provencio for reporting, Tin Lai and Alexandre
+           Provencio for contributing.
+- TW #2620 Old-style context definition should only be interpreted as read
+           context.
+           Thanks to bongoman and Tom Dörr for reporting.
+- TW #2622 Tags and dependencies appear as orphaned UDAs.
+           Thanks to Scott Mcdermott for reporting.
+- TW #2626 Waiting report lists deleted and/or completed tasks.
+           Thanks to Don Harper for reporting.
+- TW #2629 New-style context definition should take precendence over old-style
+           even if the new-style is an empty string.
+           Thanks to Denis Kasak for reporting.
+- TW #2632 Cannot build on Cygwin
+           Thanks to Michael Esemplare for contributing.
+- TW #2639 Unable to use ranges for some tasks with IDs above 1000.
+           Thanks to Manuel Haussmann for reporting.
+
+------ current release ---------------------------
+
+2.6.0 (2021-10-03) - 8174287f917a3b24c19a6601ba36fca9bdaa78c9
 
 - TW #1654 "Due" parsing behaviour seems inconsistent
            Thanks to Jim B for reporting.
@@ -134,16 +156,13 @@
            Thanks to bharatvaj for contributing.
 - TW #2581 Config entry with a trailing comment cannot be modified
 
-
------- current release ---------------------------
+------ old releases ------------------------------
 
 2.5.3 (2021-01-05) - 2f47226f91f0b02f7617912175274d9eed85924f
 
 - #2375   task hangs then dies when certain tasks are present in a report
           Thanks to Max Rossmannek, Tomáš Janoušek and Chad Phillips.
 
------- old releases ------------------------------
-
 2.5.2 (2020-12-05) - b0c17d11639dc6e783befd89c8508f2abb9b4287
 
 - TD-64   sync conflict deleted all annotations of the task

DEVELOPER.md

@@ -11,7 +11,7 @@
 ```
     $ git clone --recursive https://github.com/GothenburgBitFactory/taskwarrior taskwarrior.git
     $ cd taskwarrior.git
-    $ git checkout 2.6.0                 # Latest dev branch
+    $ git checkout develop               # Latest dev branch
     $ git submodule init                 # This is now done by cmake as a test
     $ git submodule update               # Update the libhsared.git submodule
     $ cmake -DCMAKE_BUILD_TYPE=debug .   # debug or release. Default: neither
@@ -144,13 +144,3 @@
   is possible that a patch may be rejected because it conflicts in some way with
   plans or upcoming changes. Check with us first, before sinking time and effort
   into a patch.
-
-# Current Code Base Condition
-
-**'master' branch**:
- * 2.5.3 Current release, locked.
-
-**'2.6.0' branch**:
-  * Current development branch no plans yet.
-
----

NEWS

@@ -39,8 +39,8 @@ New Features in Taskwarrior 2.6.0
     whole units like days, e.g. 'add test due:2021-07-17' would not match
     'due.before:tomorrow' (on the 16th), but would match 'due.by:tomorrow'.
   - Waiting is now an entirely "virtual" concept, based on a task's
-    'wait' property and the current time. Task is consiered "waiting" if its
-    wait attribute is in the future.  TaskWarrior no longer explicitly
+    'wait' property and the current time. Task is considered "waiting" if its
+    wait attribute is in the future. TaskWarrior no longer explicitly
     "unwaits" a task (the wait attribute is not removed once its value is in
     the past), so the "unwait' verbosity token is no longer available.
     This allows for filtering for tasks that were waiting in the past

README.md

@@ -1,7 +1,7 @@
 <div align="center">
 <img src="https://avatars.githubusercontent.com/u/36100920?s=200&u=24da05914c20c4ccfe8485310f7b83049407fa9a&v=4"></br>
 
-[![GitHub Actions build status](https://github.com/GothenburgBitFactory/taskwarrior/workflows/tests/badge.svg?branch=2.6.0)](https://github.com/GothenburgBitFactory/taskwarrior/actions)
+[![GitHub Actions build status](https://github.com/GothenburgBitFactory/taskwarrior/workflows/tests/badge.svg?branch=develop)](https://github.com/GothenburgBitFactory/taskwarrior/actions)
 [![Release](https://img.shields.io/github/v/release/GothenburgBitFactory/taskwarrior)](https://github.com/GothenburgBitFactory/taskwarrior/releases/latest)
 [![Release date](https://img.shields.io/github/release-date/GothenburgBitFactory/taskwarrior)](https://github.com/GothenburgBitFactory/taskwarrior/releases/latest)
 ![Commits since release](https://img.shields.io/github/commits-since/GothenburgBitFactory/taskwarrior/latest)
@@ -64,13 +64,15 @@ For code contributions, please use pull requests, or alternately send your code
 
 We use the following branching model:
 
-* `master` is the stable branch. Building from here is the same as building
-  from the latest tarball, or installing a binary package. No development is
-  done on the `master` branch.
+* `stable` is a branch containing the content of the latest release. Building
+  from here is the same as building from the latest tarball, or installing a
+  binary package. No development is done on the `stable` branch.
 
-* `2.6.0` is the current development branch. All work is done here, and upon
-  release it will be merged to `master`. This development branch is not stable,
-  and should be treated accordingly. Make backups.
+* `develop` is the current development branch. All work is done here, and upon
+  release it will be merged to `stable`. While development branch is not
+  stable, we utilize CI to ensure we're at least not merging improvements that
+  break existing tests, and hence should be relatively safe. We still recommend
+  making backups when using the development branch.
 
 ## Installing
 
@@ -85,13 +87,13 @@ There are many binary packages available, but to install from source requires:
 
 Download the tarball, and expand it:
 
-    $ curl -O https://taskwarrior.org/download/task-2.6.0.tar.gz
-    $ tar xzf task-2.6.0.tar.gz
-    $ cd task-2.6.0
+    $ curl -O https://taskwarrior.org/download/task-2.6.1.tar.gz
+    $ tar xzf task-2.6.1.tar.gz
+    $ cd task-2.6.1
 
 Or clone this repository:
 
-    $ git clone --recursive -b 2.6.0 https://github.com/GothenburgBitFactory/taskwarrior.git
+    $ git clone --recursive -b stable https://github.com/GothenburgBitFactory/taskwarrior.git
     $ cd taskwarrior
 
 Then build:

cmake/CXXSniffer.cmake

@@ -32,6 +32,7 @@ elseif (${CMAKE_SYSTEM_NAME} STREQUAL "GNU")
   set (GNUHURD true)
 elseif (${CMAKE_SYSTEM_NAME} STREQUAL "CYGWIN")
   set (CYGWIN true)
+  set (_CXX14_FLAGS "-std=gnu++17")
 else (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
   set (UNKNOWN true)
 endif (${CMAKE_SYSTEM_NAME} MATCHES "Linux")

index.html

@@ -0,0 +1 @@
+Taskwarrior Docs

scripts/fish/task.fish

@@ -107,7 +107,7 @@ function __fish.task.need_to_complete.attr_value
   or return 1
   # only start completion when there's a colon in attr_name
   set -l cmd (commandline -ct)
-  string match -q "*:*" "$cmd[-1]"
+  string match -q -- "*:*" "$cmd[-1]"
 end
 
 function __fish.task.need_to_complete.command
@@ -251,13 +251,13 @@ function __fish.task.list.dates
     echo -e (string replace --all -r "^|\n" "\n$user_input_numeric" $__fish_task_static_reldates | string collect)
     # special cases for 1st, 2nd and 3rd, and 4-0th
     set -l suffix 'th' '4th, 5th, etc.'
-    if string match -q "*1" $user_input_numeric
+    if string match -q -- "*1" $user_input_numeric
       set suffix 'st' 'first'
-    else if string match -q "*2" $user_input_numeric
+    else if string match -q -- "*2" $user_input_numeric
       set suffix 'nd' 'second'
-    else if string match -q "*3" $user_input_numeric
+    else if string match -q -- "*3" $user_input_numeric
       set suffix 'rd' 'third'
-    end                  
+    end
     echo -e $user_input_numeric"$suffix[1]\t$suffix[2]"
   else
     echo -e $__fish_task_static_dates

src/Context.cpp

@@ -966,16 +966,19 @@ std::string Context::getTaskContext (const std::string& kind, std::string name,
   }
 
   // Figure out the context string for this kind (read/write)
-  std::string contextString = config.get ("context." + name + "." + kind);
-  if (contextString.empty ())
+  std::string contextString = "";
+
+  if (! config.has ("context." + name + "." + kind) && kind == "read")
   {
     debug ("Specific " + kind + " context for '" + name + "' not defined. ");
     if (fallback)
     {
-      debug ("Falling back on generic.");
+      debug ("Trying to interpret old-style context definition as read context.");
       contextString = config.get ("context." + name);
     }
   }
+  else
+    contextString = config.get ("context." + name + "." + kind);
 
   debug (format ("Detected context string: {1}", contextString.empty() ? "(empty)" : contextString));
   return contextString;

src/Task.cpp

@@ -546,9 +546,11 @@ bool Task::is_udaPresent () const
 bool Task::is_orphanPresent () const
 {
   for (auto& att : data)
-    if (att.first.compare (0, 11, "annotation_", 11) != 0)
-      if (Context::getContext ().columns.find (att.first) == Context::getContext ().columns.end ())
-        return true;
+    if (! isAnnotationAttr (att.first) &&
+        ! isTagAttr (att.first) &&
+        ! isDepAttr (att.first) &&
+        Context::getContext ().columns.find (att.first) == Context::getContext ().columns.end ())
+      return true;
 
   return false;
 }
@@ -576,12 +578,14 @@ bool Task::is_overdue () const
 #endif
 
 ////////////////////////////////////////////////////////////////////////////////
+// Task is considered waiting if it's pending and the wait attribute is set as
+// future datetime value.
+// While this is not consistent with other attribute-based virtual tags, such
+// as +BLOCKED, it is more backwards compatible with how +WAITING virtual tag
+// behaved in the past, when waiting had a dedicated status value.
 bool Task::is_waiting () const
 {
-  // note that is_waiting can return true for tasks in an actual status other
-  // than pending; in this case +WAITING will be set but the status will not be
-  // "waiting"
-  if (has ("wait"))
+  if (has ("wait") && get ("status") == "pending")
   {
     Datetime now;
     Datetime wait (get_date ("wait"));
@@ -1478,7 +1482,7 @@ void Task::fixTagsAttribute ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Task::isTagAttr(const std::string& attr) const
+bool Task::isTagAttr(const std::string& attr)
 {
   return attr.compare(0, 5, "tags_") == 0;
 }
@@ -1512,7 +1516,7 @@ void Task::fixDependsAttribute ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Task::isDepAttr(const std::string& attr) const
+bool Task::isDepAttr(const std::string& attr)
 {
   return attr.compare(0, 4, "dep_") == 0;
 }
@@ -1533,7 +1537,7 @@ const std::string Task::attr2Dep (const std::string& attr) const
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-bool Task::isAnnotationAttr(const std::string& attr) const
+bool Task::isAnnotationAttr(const std::string& attr)
 {
   return attr.compare(0, 11, "annotation_") == 0;
 }

src/Task.h

@@ -113,6 +113,10 @@ public:
   bool is_overdue () const;
   bool is_udaPresent () const;
   bool is_orphanPresent () const;
+
+  static bool isTagAttr (const std::string&);
+  static bool isDepAttr (const std::string&);
+  static bool isAnnotationAttr (const std::string&);
 #endif
   bool is_waiting () const;
 
@@ -176,13 +180,10 @@ private:
   void validate_before (const std::string&, const std::string&);
   const std::string encode (const std::string&) const;
   const std::string decode (const std::string&) const;
-  bool isTagAttr (const std::string&) const;
   const std::string tag2Attr (const std::string&) const;
   const std::string attr2Tag (const std::string&) const;
-  bool isDepAttr (const std::string&) const;
   const std::string dep2Attr (const std::string&) const;
   const std::string attr2Dep (const std::string&) const;
-  bool isAnnotationAttr (const std::string&) const;
   void fixDependsAttribute ();
   void fixTagsAttribute ();
 

src/commands/CmdCustom.cpp

@@ -254,7 +254,7 @@ int CmdCustom::execute (std::string& output)
   {
     std::random_device device;
     std::mt19937 random_generator(device());
-    std::uniform_int_distribution<std::mt19937::result_type> ten_percent(1, 10);
+    std::uniform_int_distribution<std::mt19937::result_type> twentyfive_percent(1, 4);
 
     std::string NEWS_NOTICE = (
       "Recently upgraded to 2.6.0. "
@@ -262,7 +262,7 @@ int CmdCustom::execute (std::string& output)
     );
 
     // 1 in 10 chance to display the message.
-    if (ten_percent(random_generator) == 10)
+    if (twentyfive_percent(random_generator) == 4)
     {
       if (Context::getContext ().verbose ("footnote"))
         Context::getContext ().footnote (NEWS_NOTICE);

src/commands/CmdNews.cpp

@@ -575,14 +575,15 @@ int CmdNews::execute (std::string& output)
   std::stringstream outro;
   outro << underline.colorize (bold.colorize ("Taskwarrior crowdfunding\n"));
   outro << format (
-    "Taskwarrior has been in development for {1} years and its continued survival\n"
+    "Taskwarrior has been in development for {1} years but its survival\n"
     "depends on your support!\n\n"
-    "Please consider joining our {2} fundraiser and visit crowdfunding page at:\n\n",
+    "Please consider joining our {2} fundraiser to help us fund maintenance\n"
+    "and development of new features:\n\n",
     std::lround (static_cast<float>(development_time.days ()) / 365.25),
     now.year ()
   );
   outro << bold.colorize("    https://github.com/sponsors/GothenburgBitFactory/\n\n");
-  outro << "Interesting perks are available for our sponsors.\nSponsorship directly translates to more development time spent on the project.\n";
+  outro << "Perks are available for our sponsors.\n";
 
   std::cout << outro.str ();
 

src/commands/CmdUDAs.cpp

@@ -35,6 +35,7 @@
 #include <format.h>
 #include <shared.h>
 #include <util.h>
+#include <Task.h>
 
 ////////////////////////////////////////////////////////////////////////////////
 CmdUDAs::CmdUDAs ()
@@ -134,7 +135,9 @@ int CmdUDAs::execute (std::string& output)
   for (auto& i : filtered)
   {
     for (auto& att : i.data)
-      if (att.first.substr (0, 11) != "annotation_" &&
+      if (! Task::isAnnotationAttr (att.first) &&
+          ! Task::isTagAttr (att.first) &&
+          ! Task::isDepAttr (att.first) &&
           Context::getContext ().columns.find (att.first) == Context::getContext ().columns.end ())
         orphans[att.first]++;
   }

test/context.t

@@ -206,6 +206,16 @@ class ContextManagementTest(TestCase):
         self.assertEqual(len(list(filter(contains_work, out.splitlines()))), 1)
         self.assertEqual(len(list(filter(contains_home, out.splitlines()))), 1)
 
+    def test_context_list_legacy(self):
+        """Test the determination of legacy context definition."""
+        self.t('config context.old project:Old', input='y\n')
+        self.t('context old')
+        code, out, err = self.t('context list')
+
+        # Assert that "old" context has only the read component defined
+        self.assertRegex(out, r'read\s+project:Old\s+yes')
+        self.assertRegex(out, r'write\s+yes')
+
     def test_context_initially_empty(self):
         """Test that no context is set initially."""
         self.t('context define work project:Work', input='y\ny\n')

test/docker/ubuntu1604

@@ -0,0 +1,27 @@
+FROM ubuntu:16.04
+
+RUN apt-get update
+RUN apt-get install -y build-essential cmake git uuid-dev libgnutls28-dev faketime locales python3
+
+# Setup language environment
+RUN locale-gen en_US.UTF-8
+ENV LC_ALL en_US.UTF-8
+ENV LANG en_US.UTF-8
+ENV LANGUAGE en_US.UTF-8
+
+# Setup taskwarrior
+ADD . /root/code/
+WORKDIR /root/code/
+RUN git clean -dfx
+RUN git submodule init
+RUN git submodule update
+RUN cmake -DCMAKE_BUILD_TYPE=debug .
+RUN make -j2
+RUN make install
+RUN task --version
+
+# Setup tests
+WORKDIR /root/code/test/
+RUN make
+
+CMD ["bash", "-c", "./run_all -v ; cat all.log | grep 'not ok' ; ./problems"]

test/ids.t

@@ -28,6 +28,7 @@
 
 import sys
 import os
+import tempfile
 import unittest
 # Ensure python finds the local simpletap module
 sys.path.append(os.path.dirname(os.path.abspath(__file__)))
@@ -117,6 +118,53 @@ class TestIDMisParse(TestCase):
         self.assertNotIn("three", out)
 
 
+class TestIDRangeParsing(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def generate_tasks(self, n):
+        """Generates n tasks for testing purposes"""
+        with tempfile.NamedTemporaryFile(mode='w') as f:
+            f.write('\n'.join([f'{{"description": "test task {i+1}"}}' for i in range(n)]))
+            f.flush()
+            code, out, err = self.t(f'import {f.name}')
+
+    def test_single_digit_range(self):
+        """Test that parsing single digit ID range works"""
+        self.generate_tasks(20)
+        code, out, err = self.t("4-6 count")
+        self.assertEqual("3", out.strip())
+
+    def test_double_digit_range(self):
+        """Test that parsing double digit ID range works"""
+        self.generate_tasks(30)
+        code, out, err = self.t("14-26 count")
+        self.assertEqual("13", out.strip())
+
+    def test_triple_digit_range(self):
+        """Test that parsing triple digit ID range works"""
+        self.generate_tasks(150)
+        code, out, err = self.t("110-128 count")
+        self.assertEqual("19", out.strip())
+
+    def test_quadruple_digit_range(self):
+        """Test that parsing four digit ID range works"""
+        self.generate_tasks(1200)
+
+        # Full range
+        code, out, err = self.t("1100-1189 count")
+        self.assertEqual("90", out.strip())
+
+        # Partially existing range, 1200 is the last ID
+        code, out, err = self.t("1100-1289 count")
+        self.assertEqual("101", out.strip())
+
+        # Also if the range resembles time
+        code, out, err = self.t("1100-1140 count")
+        self.assertEqual("41", out.strip())
+
+
 if __name__ == "__main__":
     from simpletap import TAPTestRunner
     unittest.main(testRunner=TAPTestRunner())

test/test_certs/api.cert.pem

@@ -0,0 +1,27 @@
+-----BEGIN CERTIFICATE-----
+MIIErDCCAxSgAwIBAgIUImT6dvD09I4yGowOKIyYCFwCU/IwDQYJKoZIhvcNAQEL
+BQAwdDEVMBMGA1UEAxMMbG9jYWxob3N0IENBMR4wHAYDVQQKDBVHw7Z0ZWJvcmcg
+Qml0IEZhY3RvcnkxEjAQBgNVBAcMCUfDtnRlYm9yZzEaMBgGA1UECAwRVsOkc3Ry
+YSBHw7Z0YWxhbmQxCzAJBgNVBAYTAlNFMB4XDTE5MDMwMzE1MDAzOVoXDTIwMDMw
+MjE1MDAzOVowNDESMBAGA1UEAxMJbG9jYWxob3N0MR4wHAYDVQQKDBVHw7Z0ZWJv
+cmcgQml0IEZhY3RvcnkwggGiMA0GCSqGSIb3DQEBAQUAA4IBjwAwggGKAoIBgQDm
+SHBv3zILItaJrG+3y7dWgvsX6X3FzLVXOrhFOBNbsrHSsktt20yHZhofoelkgtlc
+kBsft5GUYGEBZuJIIFcOvpbXXTz/cYge8WhpcFo64APNc7zxykaTeIHMmEqjxqtO
+efyOmuEyWya2XbCA4aZ6emyirkem952wBJNYLIWoy53YQ79dFvH2SOWKPlXCa1B/
+ih7b9qYZE2XHoLQSbLCJqDWoQTxmOe13/1aKnJIuIy/igGsM7ygmphG4kzvyfbiA
+o+Nd50USVeeeF8P+X2YZfXFKmbzJTg4q6UUB4vqn4XegW065eIyN1Xw3Z/l8CiP0
+G27iuk/ZfRuz00+d9oTG5OtvyCMcc/kDI4Db1Xu9C5z9UpF5IIM85Ky91YxMMqPu
+ChQQoDXJ7mdtC7zRvn6t0erMVbpaqyXxKll/ybPFAZYIgV7jtSPPJDAcTsCZQLRc
+VcggScYSiWkRgW+DKsECczo++6577q++cyRBtENPOXUZ6J74eKBHizYda0chVzcC
+AwEAAaN2MHQwDAYDVR0TAQH/BAIwADATBgNVHSUEDDAKBggrBgEFBQcDAjAPBgNV
+HQ8BAf8EBQMDB6AAMB0GA1UdDgQWBBQuQdj0wAQOzML5AQ13xsb4E8Vh9DAfBgNV
+HSMEGDAWgBSmHbkkwFmCruE7I7TSI0SlD1hLiDANBgkqhkiG9w0BAQsFAAOCAYEA
+CD77JzLXB0YbgJrrkotw0I8rmrb8mw0tHkDGH70UyG6VhEt3vaYcYioxs3TIo23U
+dhOTApGdHzjrZePa0y2Kh7YtnPLAUml6hHTATE1D7Hufdtamd56URgBrEylKkpKl
+6UnwHWzlkdRWzPRo+RD9RMBzTUMiooZaP9zzzYQNEfCmMTlHqztOLPNfFR6kFLr5
+Xnc04EV/hvkByoBmo9/i4qAa3AW4y6cUHYpxVS9nBF2h364aDIIA0mn9hEewRJBq
+3odng4d+e9v9b+G1ExQXM3en39REo/b73P2VATZyMxmq5gxL1OmbOa13A+S2D0Og
+OkqNq6vzRhTxLbkqc0fjKv2TUFrnYCsCROvrMF+TAN0mG4NcfgeeziBTmHJq0D3I
+LNTRMU/BoMYG3wGu0BUak83a9JhwViR3o0iFnctuMbD2Mz6QOawgWz8BuTcwIur6
+USeERs3+G2XX499wWswGgWK5JGZ1skD1PiRsZfuaCMJHBiWolv4/G+My5IYg6B8a
+-----END CERTIFICATE-----

test/test_certs/api.key.pem

@@ -0,0 +1,182 @@
+Public Key Info:
+	Public Key Algorithm: RSA
+	Key Security Level: High (3072 bits)
+
+modulus:
+	00:e6:48:70:6f:df:32:0b:22:d6:89:ac:6f:b7:cb:b7
+	56:82:fb:17:e9:7d:c5:cc:b5:57:3a:b8:45:38:13:5b
+	b2:b1:d2:b2:4b:6d:db:4c:87:66:1a:1f:a1:e9:64:82
+	d9:5c:90:1b:1f:b7:91:94:60:61:01:66:e2:48:20:57
+	0e:be:96:d7:5d:3c:ff:71:88:1e:f1:68:69:70:5a:3a
+	e0:03:cd:73:bc:f1:ca:46:93:78:81:cc:98:4a:a3:c6
+	ab:4e:79:fc:8e:9a:e1:32:5b:26:b6:5d:b0:80:e1:a6
+	7a:7a:6c:a2:ae:47:a6:f7:9d:b0:04:93:58:2c:85:a8
+	cb:9d:d8:43:bf:5d:16:f1:f6:48:e5:8a:3e:55:c2:6b
+	50:7f:8a:1e:db:f6:a6:19:13:65:c7:a0:b4:12:6c:b0
+	89:a8:35:a8:41:3c:66:39:ed:77:ff:56:8a:9c:92:2e
+	23:2f:e2:80:6b:0c:ef:28:26:a6:11:b8:93:3b:f2:7d
+	b8:80:a3:e3:5d:e7:45:12:55:e7:9e:17:c3:fe:5f:66
+	19:7d:71:4a:99:bc:c9:4e:0e:2a:e9:45:01:e2:fa:a7
+	e1:77:a0:5b:4e:b9:78:8c:8d:d5:7c:37:67:f9:7c:0a
+	23:f4:1b:6e:e2:ba:4f:d9:7d:1b:b3:d3:4f:9d:f6:84
+	c6:e4:eb:6f:c8:23:1c:73:f9:03:23:80:db:d5:7b:bd
+	0b:9c:fd:52:91:79:20:83:3c:e4:ac:bd:d5:8c:4c:32
+	a3:ee:0a:14:10:a0:35:c9:ee:67:6d:0b:bc:d1:be:7e
+	ad:d1:ea:cc:55:ba:5a:ab:25:f1:2a:59:7f:c9:b3:c5
+	01:96:08:81:5e:e3:b5:23:cf:24:30:1c:4e:c0:99:40
+	b4:5c:55:c8:20:49:c6:12:89:69:11:81:6f:83:2a:c1
+	02:73:3a:3e:fb:ae:7b:ee:af:be:73:24:41:b4:43:4f
+	39:75:19:e8:9e:f8:78:a0:47:8b:36:1d:6b:47:21:57
+	37:
+
+public exponent:
+	01:00:01:
+
+private exponent:
+	00:8b:e2:40:fa:93:f8:10:2f:af:66:9d:ea:97:19:16
+	5b:64:e1:26:1b:5d:9d:43:c6:7c:20:5d:43:1e:d7:13
+	82:ae:e6:30:0c:05:c5:8a:ed:4c:a6:5d:c4:ba:c3:a5
+	80:67:eb:d9:ae:20:92:3c:31:77:7b:a4:85:9c:0e:99
+	13:89:ce:93:30:3e:17:65:5d:ac:7e:34:50:a8:41:07
+	36:80:d8:d2:8f:59:c8:e7:aa:39:2f:8f:9a:8a:ec:85
+	88:15:f9:9f:e2:f8:4e:07:8a:bb:2f:58:26:19:83:f8
+	de:b9:73:38:36:e9:ab:91:0a:a6:9b:80:ed:b4:cd:d4
+	45:2b:b2:ed:24:57:65:d2:c1:2a:72:d4:d1:1c:c3:26
+	f1:15:28:4f:aa:8a:5f:47:28:33:51:5a:5b:48:3d:e1
+	d7:1c:e8:cb:36:25:7c:6b:7f:c6:be:c2:51:1c:de:e7
+	4b:d4:90:a0:35:66:fb:f7:c5:d2:67:3d:59:a2:b6:a0
+	8a:c6:03:8b:db:3a:39:32:28:21:ba:11:3b:a3:77:90
+	59:0d:72:81:01:ad:5f:66:92:b5:6c:61:d2:8c:60:eb
+	e5:62:8d:5c:71:72:99:7c:12:b8:1c:c6:ba:ee:64:17
+	41:04:b6:d2:59:f0:1a:0f:74:ca:d5:19:1e:98:f4:61
+	75:c3:e1:50:27:af:fa:48:87:3d:c9:11:aa:70:3e:56
+	64:a1:dc:42:d9:16:a6:d2:14:98:48:cd:ad:d2:09:33
+	00:10:5f:3c:69:36:81:96:75:44:f8:56:95:d2:e5:76
+	85:41:85:8d:f1:64:14:05:6b:f7:2a:26:6a:d9:f0:b9
+	d0:de:d6:3d:7e:7c:6c:2c:26:49:22:5e:2a:04:21:4f
+	c9:d7:3c:a1:1b:7b:d1:27:1d:80:38:25:57:7f:a2:99
+	46:d7:60:56:e6:5d:50:71:36:b6:af:a6:5b:d0:92:d8
+	19:0e:86:4b:3b:34:cf:cd:ea:e5:35:e4:4e:65:e3:20
+	91:
+
+prime1:
+	00:f7:07:aa:be:24:f1:2f:26:ea:0e:45:86:b0:45:05
+	df:b8:59:d6:3b:40:5c:dd:c8:bf:18:3e:76:74:e8:31
+	35:ca:b0:d4:63:df:4d:4c:d5:0c:46:6e:31:71:3c:17
+	5e:45:4e:5c:a1:96:4f:69:5e:92:bd:e8:09:27:85:50
+	e3:29:1d:bb:8e:f9:2c:41:af:0f:c8:e0:d3:70:6a:d4
+	b9:67:43:08:e4:4a:c9:12:f6:d2:7e:7d:bc:69:52:ba
+	48:96:0a:7e:42:e7:6e:82:e8:0c:6c:1b:a5:01:f0:36
+	2c:ae:a4:2f:d8:62:ef:ab:1c:47:3a:98:79:40:68:dd
+	de:6a:b4:8c:53:03:09:78:11:27:36:6f:e4:2b:fb:f4
+	4d:bf:13:30:37:1f:51:fd:2f:84:d9:b9:62:ea:91:a8
+	e8:72:9d:78:14:bd:5a:9e:1f:06:12:70:19:bd:3b:80
+	b2:5c:33:8b:d6:5b:9c:2f:f9:12:46:55:4a:5a:10:bc
+	f5:
+
+prime2:
+	00:ee:a5:18:9e:e5:9a:59:d4:d9:0c:42:4c:cf:a1:d7
+	ca:8f:b5:45:24:59:f9:83:1f:f4:f2:82:01:50:3c:e0
+	ae:bf:17:39:09:cd:5a:71:dd:ab:9e:b6:d6:1e:47:dc
+	34:eb:28:c0:4c:77:e5:05:5d:e3:0a:57:bf:65:1f:f8
+	29:68:08:45:ee:da:01:bc:57:c6:35:a7:2c:82:62:64
+	2a:cd:46:eb:54:eb:27:e2:eb:d5:d3:d3:04:ef:05:a1
+	4c:63:ec:d4:23:6f:60:02:71:a8:c3:ab:a5:2f:26:4e
+	ea:e1:a3:f5:e4:d2:59:19:c9:26:18:c5:4d:45:1e:61
+	1d:53:7c:6a:83:d2:18:40:dd:10:af:e8:24:09:1a:06
+	9b:f1:51:33:8e:13:e0:ce:18:b3:f0:8b:f3:9d:12:b3
+	e7:88:01:a1:c1:38:0d:c9:c6:0e:49:99:37:2f:be:60
+	e3:37:9d:c6:a8:cb:4b:c5:c0:49:2a:5d:fb:f2:fb:e7
+	fb:
+
+coefficient:
+	22:52:c4:c2:c3:dd:30:13:54:c7:95:54:b2:cb:24:b5
+	0c:88:f4:22:a7:6a:13:b3:17:5f:0b:b2:8c:4f:2c:e6
+	d3:b6:ca:cd:e6:70:e4:37:5d:65:16:50:ae:b8:cc:bf
+	80:81:3d:e5:5c:0e:6d:ec:f9:4e:f5:49:00:fd:63:28
+	2a:ab:03:92:ae:b6:a6:97:ed:f0:97:25:55:06:3f:15
+	be:cf:70:22:bd:af:f8:2c:3f:ce:d5:e5:e6:5f:94:d7
+	d2:0a:fb:99:d7:ad:ab:d1:3a:b8:fb:6c:b0:47:1c:60
+	81:b1:8c:5e:df:25:8b:93:82:8c:28:52:99:5e:e7:e7
+	f8:fc:30:48:bd:43:82:9e:39:2b:7b:14:6b:fb:1b:8a
+	7d:f1:1e:06:01:ca:7d:59:54:79:00:fa:76:bd:a9:a1
+	02:ad:c4:7e:0b:56:c2:37:6b:7d:20:5f:53:ef:46:88
+	cf:24:e2:4c:25:fc:98:49:40:38:10:19:6f:3c:18:4c
+	
+
+exp1:
+	00:8b:1e:3a:3e:13:37:f0:c2:0d:96:33:f9:82:53:9c
+	d7:3d:4e:fa:a3:2b:c0:20:f6:e9:07:92:45:cb:d8:e7
+	bd:cf:84:7e:58:30:6d:ac:13:5f:72:5a:a4:65:8c:dd
+	ec:2d:43:d0:4f:00:03:80:e7:cd:e4:3d:44:ca:88:fd
+	e0:b0:4b:1a:51:8e:6a:2a:23:98:d4:1c:29:77:69:f2
+	9a:e7:58:8d:2d:64:20:91:19:87:b9:cc:bd:ca:e2:d8
+	1e:00:c1:b0:11:a5:9c:4b:04:bb:da:36:47:5b:2c:18
+	96:59:54:05:cd:eb:09:e6:67:6a:85:c9:50:9f:c1:6f
+	11:cf:2e:16:c8:b9:31:1f:f9:29:08:33:43:60:b1:e8
+	07:d0:cf:d1:9b:79:7c:07:06:37:df:15:d4:6b:1d:d4
+	ed:f3:7e:53:1d:fa:f5:89:8f:17:30:53:09:6b:d4:92
+	c9:df:ba:f7:c9:a4:95:f5:3e:63:d8:50:38:2b:38:b9
+	f1:
+
+exp2:
+	00:ed:06:45:41:ec:c2:35:5e:d6:84:fa:84:d7:e4:e3
+	33:69:30:9d:8f:d1:5d:a5:02:e4:82:c8:e5:0d:10:aa
+	08:65:fb:66:c7:79:92:cf:6d:5f:bb:af:d5:53:16:04
+	7c:fa:e3:ea:bb:08:8a:0b:9e:88:96:09:39:2b:f3:68
+	c3:97:74:40:21:4f:9e:51:b6:cc:43:15:db:7b:54:c6
+	30:4c:da:97:7a:2c:65:dd:58:67:74:90:2e:62:48:b1
+	3f:f2:2f:93:33:ee:b6:e9:36:82:6c:75:db:06:cd:81
+	ac:80:98:1c:ee:3c:8e:0a:b2:62:88:4f:ce:c3:4b:bd
+	21:27:7e:77:3c:9e:3b:40:91:50:b5:a6:57:c4:42:79
+	36:01:a4:a9:14:00:62:53:d0:ed:47:89:79:59:14:ee
+	62:94:0f:2a:dd:82:13:0f:c9:0a:ff:c6:91:ad:75:e5
+	3d:48:4c:08:b8:35:d2:f8:82:57:29:21:57:d0:aa:aa
+	69:
+
+
+Public Key PIN:
+	pin-sha256:SSdvX3918szw/veSWFuQJD3lGynf9mFLiTxpZPj/Jz4=
+Public Key ID:
+	sha256:49276f5f7f75f2ccf0fef792585b90243de51b29dff6614b893c6964f8ff273e
+	sha1:2e41d8f4c0040eccc2f9010d77c6c6f813c561f4
+
+-----BEGIN RSA PRIVATE KEY-----
+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
+-----END RSA PRIVATE KEY-----

test/uda.t

@@ -314,7 +314,7 @@ class Test1447(TestCase):
         self.t = Task()
 
     def test_filter_uda(self):
-        """1447: Verify ability to filter on empty UDA"""
+        """1447: Verify ability to filter on empty UDA that resembles named date"""
         self.t.config('uda.sep.type', 'string')
         self.t('add one')
         self.t('add two sep:foo')

test/uda_orphan.t

@@ -82,6 +82,24 @@ class TestUDAOrphans(TestCase):
         code, out, err = self.t("_get 1.description")
         self.assertIn("one extra:foo", out)
 
+    def test_orphan_identification(self):
+        """Verify that orphans are identified by +ORPHAN tag and udas command"""
+
+        # Create one task with legitimate orphan attribute and others without
+        self.t("rc.uda.extra.type:string rc.uda.extra.label:Extra add one extra:foo")
+        self.t("add two no attributes")
+        self.t("add three +test ")
+        self.t("add four +test depends:3")
+        self.t("4 annotate annotation content")
+
+        # Only the first task should be identified as orphan
+        code, out, err = self.t("+ORPHAN ids")
+        self.assertEqual("1", out.strip())
+
+        # Only the first task should be identified as orphan
+        code, out, err = self.t("udas")
+        self.assertRegex(out, r'extra\s+1\s+1 Orphan UDA')
+
 
 if __name__ == "__main__":
     from simpletap import TAPTestRunner

test/wait.t

@@ -87,14 +87,18 @@ class Test1486(TestCase):
 
     def test_waiting(self):
         """1486: Verify waiting report shows waiting tasks"""
-        self.t.config('uda.sep.type', 'string')
-
         self.t('add regular')
-        self.t('add waited wait:later')
+        self.t('add waited and pending wait:later')
+        self.t('add waited but deleted wait:later')
+        self.t('add waited but done wait:later')
+        self.t('rc.confirmation=off 3 delete')
+        self.t('4 done')
 
         code, out, err = self.t('waiting')
         self.assertEqual(0, code, "Exit code was non-zero ({0})".format(code))
-        self.assertIn('waited', out)
+        self.assertIn('waited and pending', out)
+        self.assertNotIn('waited but deleted', out)
+        self.assertNotIn('waited but done', out)
         self.assertNotIn('regular', out)