From 0990b0d582f6916b63c129a110ecf27dac4d3244 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 13 Jul 2015 10:41:55 -0400
Subject: [PATCH] TW-1575: `task log` mangles URLs when quoted

- Thanks to Luke Macken.
---
 ChangeLog               |  1 +
 src/commands/CmdLog.cpp |  8 +++---
 test/tw-1575.t          | 58 +++++++++++++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 4 deletions(-)
 create mode 100755 test/tw-1575.t

diff --git a/ChangeLog b/ChangeLog
index 326383d2c..d29932217 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,7 @@
           Babej).
 - TW-1527 Extra spaces added around slashes (thanks to Renato Alves).
 - TW-1572 Better urgency inheritance (thanks to Jens Erat).
+- TW-1575 `task log` mangles URLs when quoted (thanks to Luke Macken).
 - TW-1600 Filtering "regressions"(?) in task-2.4.3, task-2.4.4 (thanks to Ralph
           Bean).
 - TW-1609 In 'urgency<10', 10 is interpreted as an ID (thanks to Wim Schuermann).
diff --git a/src/commands/CmdLog.cpp b/src/commands/CmdLog.cpp
index 68968d391..6d7cd801e 100644
--- a/src/commands/CmdLog.cpp
+++ b/src/commands/CmdLog.cpp
@@ -47,28 +47,28 @@ CmdLog::CmdLog ()
 ////////////////////////////////////////////////////////////////////////////////
 int CmdLog::execute (std::string& output)
 {
-  int rc = 0;
-
   // Apply the command line modifications to the new task.
   Task task;
   task.modify (Task::modReplace, true);
   task.setStatus (Task::completed);
 
-  // Recurring tasks get a special status.
+  // Cannot log recurring tasks.
   if (task.has ("recur"))
     throw std::string (STRING_CMD_LOG_NO_RECUR);
 
+  // Cannot log waiting tasks.
   if (task.has ("wait"))
     throw std::string (STRING_CMD_LOG_NO_WAITING);
 
   context.tdb2.add (task);
+
   if (context.verbose ("project"))
     context.footnote (onProjectChange (task));
 
   if (context.verbose ("affected"))
     output = std::string (STRING_CMD_LOG_LOGGED) + "\n";
 
-  return rc;
+  return 0;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/test/tw-1575.t b/test/tw-1575.t
new file mode 100755
index 000000000..873b97166
--- /dev/null
+++ b/test/tw-1575.t
@@ -0,0 +1,58 @@
+#!/usr/bin/env python2.7
+# -*- coding: utf-8 -*-
+###############################################################################
+#
+# Copyright 2006 - 2015, 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 os
+import unittest
+# Ensure python finds the local simpletap module
+sys.path.append(os.path.dirname(os.path.abspath(__file__)))
+
+from basetest import Task, TestCase
+
+
+class TestBug1575(TestCase):
+    def setUp(self):
+        """Executed before each test in the class"""
+        self.t = Task()
+
+    def test_spurious_whitespace_in_url(self):
+        """ensure that extra whitespace does not get inserted into a URL.
+
+           tw-1575: `task log` mangles URLs when quoted
+        """
+        self.t("log testing123 https://bug.tasktools.org")
+
+        code, out, err = self.t("completed")
+        self.assertIn("testing123 https://bug.tasktools.org", out)
+
+
+if __name__ == "__main__":
+    from simpletap import TAPTestRunner
+    unittest.main(testRunner=TAPTestRunner())
+
+# vim: ai sts=4 et sw=4