From 012e47267f523ad8b2d6016da740f50f5656daa3 Mon Sep 17 00:00:00 2001
From: Paul Beckingham <paul@beckingham.net>
Date: Mon, 9 Mar 2009 03:06:41 -0400
Subject: [PATCH] Bug Fix - concatenated description on modify

- When a task was modified, the new description was concatenated
  without spaces.
---
 src/parse.cpp          | 12 ++++++--
 src/tests/bug.concat.t | 66 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 76 insertions(+), 2 deletions(-)
 create mode 100755 src/tests/bug.concat.t

diff --git a/src/parse.cpp b/src/parse.cpp
index 99f2d9187..d6528436c 100644
--- a/src/parse.cpp
+++ b/src/parse.cpp
@@ -475,12 +475,20 @@ void parse (
         if (isCommand (l) && validCommand (l))
           command = l;
         else
-          descCandidate += arg;
+        {
+          if (descCandidate.length ())
+            descCandidate += " ";
+          descCandidate += std::string (arg);
+        }
       }
 
       // Anything else is just considered description.
       else
-        descCandidate += std::string (arg) + " ";
+      {
+        if (descCandidate.length ())
+          descCandidate += " ";
+        descCandidate += std::string (arg);
+      }
     }
   }
 
diff --git a/src/tests/bug.concat.t b/src/tests/bug.concat.t
new file mode 100755
index 000000000..74a82896f
--- /dev/null
+++ b/src/tests/bug.concat.t
@@ -0,0 +1,66 @@
+#! /usr/bin/perl
+################################################################################
+## task - a command line task list manager.
+##
+## Copyright 2006 - 2009, Paul Beckingham.
+## 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
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 5;
+
+# Create the rc file.
+if (open my $fh, '>', 'bug_concat.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'bug_concat.rc', 'Created bug_concat.rc');
+}
+
+# When a task is modified like this:
+#
+#   % task 1 This is a new description
+#
+# The arguments are concatenated thus:
+#
+#   Thisisanewdescription
+
+qx{../task rc:bug_concat.rc add This is the original text};
+
+my $output = qx{../task rc:bug_concat.rc info 1};
+like ($output, qr/Description\s+This is the original text\n/, 'original correct');
+
+qx{../task rc:bug_concat.rc 1 This is the modified text};
+$output = qx{../task rc:bug_concat.rc info 1};
+like ($output, qr/Description\s+This is the modified text\n/, 'modified correct');
+
+# Cleanup.
+unlink 'pending.data';
+ok (!-r 'pending.data', 'Removed pending.data');
+
+unlink 'bug_concat.rc';
+ok (!-r 'bug_concat.rc', 'Removed bug_concat.rc');
+
+exit 0;
+