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

src/TDB2.cpp

@@ -759,6 +759,10 @@ void TDB2::merge (const std::string& mergeFile)
         break;
     }
   }
+  else
+  {
+	  undo_lines.push_back (lline + "\n");
+  }
 
   // Add some color.
   Color colorAdded    (context.config.get ("color.sync.added"));
@@ -768,10 +772,12 @@ void TDB2::merge (const std::string& mergeFile)
   // at this point we can assume: (lline==rline) || (lit == l.end())
   // thus we search for the first non-equal lines or the EOF
   bool found = false;
-  for ( ; (lit != l.end ()) && (rit != r.end ()); ++lit, ++rit)
+  for (std::vector<std::string>::const_iterator tmp_lit = lit, tmp_rit = rit;
+       (tmp_lit != l.end ()) && (tmp_rit != r.end ());
+		 ++tmp_lit, ++tmp_rit)
   {
-    lline = *lit;
-    rline = *rit;
+    lline = *tmp_lit;
+    rline = *tmp_rit;
 
     // found first non-matching lines?
     if (lline.compare (rline) != 0)
@@ -779,13 +785,28 @@ void TDB2::merge (const std::string& mergeFile)
       found = true;
       break;
     }
-    else
+    else if (tmp_lit->substr (0, 3) == "---")
     {
-      // push the line to the new undo.data
-      undo_lines.push_back (lline + "\n");
+      while (lit != tmp_lit)
+      {
+        ++lit;
+        ++rit;
+        undo_lines.push_back(*lit + "\n");
+      }
+      // at this point, all iterators (tmp_{lit,rit}, lit and rit) are at the same line
     }
   }
 
+  if (!found)
+  {
+    // set iterators to r.end() or l.end() if they are point to the last line
+    if (++rit != r.end())
+      --rit;
+
+    if (++lit != l.end())
+      --lit;
+  }
+
   ///////////////////////////////////////
   // branch-off point found:
   if (found)
@@ -1883,3 +1904,4 @@ void TDB2::dump ()
 }
 
 ////////////////////////////////////////////////////////////////////////////////
+// vim: ts=2 et sw=2

src/commands/CmdIDs.cpp

@@ -66,6 +66,8 @@ int CmdIDs::execute (std::string& output)
 
   std::sort (ids.begin (), ids.end ());
   output = compressIds (ids) + "\n";
+  
+  context.headers.clear ();
   return 0;
 }
 
@@ -98,6 +100,8 @@ int CmdCompletionIds::execute (std::string& output)
   std::sort (ids.begin (), ids.end ());
   join (output, "\n", ids);
   output += "\n";
+
+  context.headers.clear ();
   return 0;
 }
 
@@ -131,6 +135,8 @@ int CmdZshCompletionIds::execute (std::string& output)
           << "\n";
 
   output = out.str ();
+
+  context.headers.clear ();
   return 0;
 }
 
@@ -161,6 +167,8 @@ int CmdUUIDs::execute (std::string& output)
   std::sort (uuids.begin (), uuids.end ());
   join (output, ",", uuids);
   output += "\n";
+
+  context.headers.clear ();
   return 0;
 }
 
@@ -191,6 +199,8 @@ int CmdCompletionUuids::execute (std::string& output)
   std::sort (uuids.begin (), uuids.end ());
   join (output, "\n", uuids);
   output += "\n";
+
+  context.headers.clear ();
   return 0;
 }
 
@@ -222,6 +232,8 @@ int CmdZshCompletionUuids::execute (std::string& output)
         << "\n";
 
   output = out.str ();
+
+  context.headers.clear ();
   return 0;
 }
 

test/bug.1104.t

@@ -0,0 +1,128 @@
+#! /usr/bin/env perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006-2012, 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 File::Copy;
+use File::Path;
+use Test::More tests => 18;
+
+mkdir("1",       0755);
+mkdir("2",       0755);
+mkdir("dropbox", 0755);
+
+ok (-e "1",       'Created directory 1/');
+ok (-e "2",       'Created directory 2/');
+ok (-e "dropbox", 'Created directory dropbox/');
+
+# Create the rc file.
+if (open my $fh, '>', '1.rc')
+{
+  print $fh "data.location=1/\n";
+  print $fh "confirmation=no\n";
+  print $fh "merge.autopush=yes\n";
+  print $fh "merge.default.uri=./dropbox/\n";
+  print $fh "push.default.uri=./dropbox/\n";
+  print $fh "pull.default.uri=./dropbox/\n";
+
+  close $fh;
+  ok (-r '1.rc', 'Created 1.rc');
+}
+
+# Create the rc file.
+if (open my $fh, '>', '2.rc')
+{
+  print $fh "data.location=2/\n";
+  print $fh "confirmation=no\n";
+  print $fh "merge.autopush=yes\n";
+  print $fh "merge.default.uri=./dropbox/\n";
+  print $fh "push.default.uri=./dropbox/\n";
+  print $fh "pull.default.uri=./dropbox/\n";
+
+  close $fh;
+  ok (-r '2.rc', 'Created 2.rc');
+}
+
+# Once-only push from 1 --> dropbox
+my $output = qx{../src/task rc:1.rc add one 2>&1};
+ok ($? == 0, 'Exit status check');
+$output = qx{../src/task rc:1.rc push 2>&1};
+ok ($? == 0, 'Exit status check');
+
+# Merges to 2
+$output = qx{../src/task rc:2.rc merge 2>&1};
+ok ($? == 0, 'Exit status check');
+
+# Make a different change in both locations
+$output = qx{../src/task rc:1.rc add two 2>&1};
+ok ($? == 0, 'Exit status check');
+$output = qx{../src/task rc:1.rc two done 2>&1};
+ok ($? == 0, 'Exit status check');
+$output = qx{../src/task rc:2.rc 1 done 2>&1};
+ok ($? == 0, 'Exit status check');
+
+# Merges everywhere
+$output = qx{../src/task rc:1.rc merge 2>&1};
+ok ($? == 0, 'Exit status check');
+$output = qx{../src/task rc:2.rc merge 2>&1};
+ok ($? == 0, 'Exit status check');
+
+# see if undo.data is corrupt
+$output = qx{cat 2/undo.data};
+unlike ($output, qr/time 0/, "undo.data corrupt");
+
+# merge again in order to stimulate duplications
+$output = qx{../src/task rc:1.rc merge 2>&1};
+ok ($? == 0, 'Exit status check');
+$output = qx{../src/task rc:1.rc diag 2>&1};
+unlike ($output, qr/Found duplicate/, "Found duplicate");
+
+# Cleanup.
+unlink qw(1.rc 1/pending.data 1/completed.data 1/undo.data 1/backlog.data 1/synch.key 2/pending.data 2/completed.data 2/undo.data 2.rc 2/backlog.data 2/synch.key dropbox/completed.data dropbox/pending.data dropbox/undo.data);
+ok (! -r '1/pending.data'         &&
+    ! -r '1/completed.data'       &&
+    ! -r '1/undo.data'            &&
+    ! -r '1/backlog.data'         &&
+    ! -r '1/synch.key'            &&
+    ! -r '1.rc'                   &&
+    ! -r '2/pending.data'         &&
+    ! -r '2/completed.data'       &&
+    ! -r '2/undo.data'            &&
+    ! -r '2/backlog.data'         &&
+    ! -r '2/synch.key'            &&
+    ! -r '2.rc'                   &&
+    ! -r 'dropbox/pending.data'   &&
+    ! -r 'dropbox/completed.data' &&
+    ! -r 'dropbox/undo.data' , 'Cleanup');
+
+rmtree (['1', '2', 'dropbox'], 0, 1);
+ok (! -e '1'             &&
+    ! -e '2'             &&
+    ! -e 'dropbox', 'Removed directories');
+
+exit 0;