[PATCH 4/4] lib: Treat messages in new/ as maildir messages with no flags set

diff --git a/be/d0964cb6090bf1dbf71b57305bdfe404f8b36e b/be/d0964cb6090bf1dbf71b57305bdfe404f8b36e
new file mode 100644 (file)
index 0000000..4664cc4
--- /dev/null
+++ b/be/d0964cb6090bf1dbf71b57305bdfe404f8b36e
@@ -0,0 +1,127 @@
+Return-Path: <amdragon@mit.edu>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6BB98431FD6\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:17 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id DXEFtDBpvvIA for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Jun 2012 09:58:15 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id 4DC43431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Jun 2012 09:58:15 -0700 (PDT)\r
+X-AuditID: 12074425-b7f9b6d0000008c4-6c-4fcb97a75ee7\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 51.B9.02244.7A79BCF4; Sun,  3 Jun 2012 12:58:15 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id q53GwEYI011012; \r
+       Sun, 3 Jun 2012 12:58:14 -0400\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id q53GwDZq004210\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sun, 3 Jun 2012 12:58:14 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SbE7k-000380-O1; Sun, 03 Jun 2012 12:57:52 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 4/4] lib: Treat messages in new/ as maildir messages with no\r
+       flags set\r
+Date: Sun,  3 Jun 2012 12:57:36 -0400\r
+Message-Id: <1338742656-11640-5-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
+References: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrLIsWRmVeSWpSXmKPExsUixCmqrbt8+ml/g57JXBbXb85kdmD0eLbq\r
+       FnMAYxSXTUpqTmZZapG+XQJXxoOvrSwFF/kr/t5pZ21g3M3TxcjJISFgItH6+z8LhC0mceHe\r
+       ejYQW0hgH6PEnPbYLkYuIHs9o8SkhT+ZIJyHTBKtc86zQjhzGSUervvECtLCJqAhsW3/ckYQ\r
+       W0RAWmLn3dlAcQ4OZgE1iT9dKiBhYYEwiQXLzzOD2CwCqhJ3W26D2bwCDhLTH8xkhLhCXuLp\r
+       /T42kFZOAUeJ3gMmEAc5SHxouMI+gZF/ASPDKkbZlNwq3dzEzJzi1GTd4uTEvLzUIl0LvdzM\r
+       Er3UlNJNjKCQYXdR3cE44ZDSIUYBDkYlHt5Ps075C7EmlhVX5h5ilORgUhLlnTb1tL8QX1J+\r
+       SmVGYnFGfFFpTmrxIUYJDmYlEd5OO6Acb0piZVVqUT5MSpqDRUmcd53mbn8hgfTEktTs1NSC\r
+       1CKYrAwHh5IEb880oEbBotT01Iq0zJwShDQTByfIcB6g4RNBaniLCxJzizPTIfKnGHU55h06\r
+       d51RiCUvPy9VSpxXBBitQgIgRRmleXBzYLH+ilEc6C1hXnWQKh5gmoCb9ApoCRPQEoPDJ0GW\r
+       lCQipKQaGM0yOTftuJYd8Jl3enf5BafGcw/0k+/dXnm67msFQ9hzS6M23oPrli/ZFPDMcEft\r
+       yr8MD2t05S9X1rme62H/JvvEqqfs5iaTMP1lX28wBJ/xaCoTjbw5gUOkV6Gj8MUSnU/Xnern\r
+       VXmdP3fYnXG3m97JilPZr/nSDLyOxnOeK/7X6jyl5McaViWW4oxEQy3mouJEAJtShdXQAgAA\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 03 Jun 2012 16:58:17 -0000\r
+\r
+This fixes the broken test added a few patches ago by synchronizing\r
+the tags of messages in new/, even if they have no "info" part.  See\r
+the test patch for rationale.\r
+---\r
+ lib/message.cc    |   20 +++++++++++++-------\r
+ test/maildir-sync |    1 -\r
+ 2 files changed, 13 insertions(+), 8 deletions(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index bbac2ff..978de06 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1090,13 +1090,19 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+           continue;\r
+ \r
+       flags = strstr (filename, ":2,");\r
+-      if (! flags)\r
+-          continue;\r
+-\r
+-      seen_maildir_info = 1;\r
+-      flags += 3;\r
+-\r
+-      combined_flags = talloc_strdup_append (combined_flags, flags);\r
++      if (flags) {\r
++          seen_maildir_info = 1;\r
++          flags += 3;\r
++          combined_flags = talloc_strdup_append (combined_flags, flags);\r
++      } else if (STRNCMP_LITERAL (dir, "new/") == 0) {\r
++          /* Messages are delivered to new/ with no "info" part, but\r
++           * they effectively have default maildir flags.  According\r
++           * to the spec, we should ignore the info part for\r
++           * messages in new/, but some MUAs (mutt) can set maildir\r
++           * flags on messages in new/, so we're liberal in what we\r
++           * accept. */\r
++          seen_maildir_info = 1;\r
++      }\r
+     }\r
+ \r
+     /* If none of the filenames have any maildir info field (not even\r
+diff --git a/test/maildir-sync b/test/maildir-sync\r
+index 6360fd2..01348d3 100755\r
+--- a/test/maildir-sync\r
++++ b/test/maildir-sync\r
+@@ -167,7 +167,6 @@ notmuch tag +unread +draft -flagged subject:"Non-compliant maildir info"\r
+ test_expect_equal "$(cd $MAIL_DIR/cur/; ls non-compliant*)" "non-compliant-maildir-info:2,These-are-not-flags-in-ASCII-order-donottouch"\r
+ \r
+ test_begin_subtest "Files in new/ get default synchronized tags"\r
+-test_subtest_known_broken\r
+ OLDCONFIG=$(notmuch config get new.tags)\r
+ notmuch config set new.tags test\r
+ add_message [subject]='"File in new/"' [dir]=new [filename]='file-in-new'\r
+-- \r
+1.7.10\r
+\r