[PATCH v2 3/5] lib: Only synchronize maildir flags for messages in maildirs

diff --git a/90/a06a03dc5071f88fde6a3be70d7229c9672440 b/90/a06a03dc5071f88fde6a3be70d7229c9672440
new file mode 100644 (file)
index 0000000..e208625
--- /dev/null
+++ b/90/a06a03dc5071f88fde6a3be70d7229c9672440
@@ -0,0 +1,115 @@
+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 077D9431FAE\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Jun 2012 12:14:58 -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 xIwGjTgjJGXe for <notmuch@notmuchmail.org>;\r
+       Sat,  9 Jun 2012 12:14:57 -0700 (PDT)\r
+Received: from dmz-mailsec-scanner-7.mit.edu (DMZ-MAILSEC-SCANNER-7.MIT.EDU\r
+       [18.7.68.36])\r
+       by olra.theworths.org (Postfix) with ESMTP id 646DB431FBF\r
+       for <notmuch@notmuchmail.org>; Sat,  9 Jun 2012 12:14:55 -0700 (PDT)\r
+X-AuditID: 12074424-b7f826d000000926-39-4fd3a0ae72db\r
+Received: from mailhub-auth-1.mit.edu ( [18.9.21.35])\r
+       by dmz-mailsec-scanner-7.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id FF.16.02342.EA0A3DF4; Sat,  9 Jun 2012 15:14:54 -0400 (EDT)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-1.mit.edu (8.13.8/8.9.2) with ESMTP id q59JErsL015442; \r
+       Sat, 9 Jun 2012 15:14:53 -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 q59JEq3g026106\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 9 Jun 2012 15:14:53 -0400 (EDT)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1SdR75-0000wt-Nq; Sat, 09 Jun 2012 15:14:19 -0400\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 3/5] lib: Only synchronize maildir flags for messages in\r
+       maildirs\r
+Date: Sat,  9 Jun 2012 15:14:16 -0400\r
+Message-Id: <1339269258-3542-4-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10\r
+In-Reply-To: <1339269258-3542-1-git-send-email-amdragon@mit.edu>\r
+References: <1338742656-11640-1-git-send-email-amdragon@mit.edu>\r
+       <1339269258-3542-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrDIsWRmVeSWpSXmKPExsUixCmqrLtuwWV/g6vHjC2apjtbXL85k9mB\r
+       yePW/dfsHs9W3WIOYIrisklJzcksSy3St0vgyjiwcS57wUvuitn9P9gbGA9zdjFyckgImEi0\r
+       3fzFCmGLSVy4t56ti5GLQ0hgH6PEr2v3GCGc9YwSj/ecYoZwHjJJ9O5ohSqbyyjxovU3O0g/\r
+       m4CGxLb9yxlBbBEBaYmdd2cDzeXgYBYwl7jZEgcSFhYIkXj96ANYCYuAqsTpc5fYQGxeAXuJ\r
+       u+37oc6Ql3h6vw8szingIPHs+3SweiGBMolnp2ezTWDkX8DIsIpRNiW3Sjc3MTOnODVZtzg5\r
+       MS8vtUjXXC83s0QvNaV0EyMokNhdVHYwNh9SOsQowMGoxMOrJX/JX4g1say4MvcQoyQHk5Io\r
+       75f5l/2F+JLyUyozEosz4otKc1KLDzFKcDArifBuZQIq501JrKxKLcqHSUlzsCiJ86ZynfUX\r
+       EkhPLEnNTk0tSC2CycpwcChJ8DIBI0ZIsCg1PbUiLTOnBCHNxMEJMpwHaPgbkMW8xQWJucWZ\r
+       6RD5U4yKUuK830ESAiCJjNI8uF5YpL9iFAd6RZj3J0gVDzBJwHW/AhrMBDS4NeoCyOCSRISU\r
+       VANjWG9CUbzB5pz57/OPV3+b/3T+W6fXVyZM+L3P/vScGWbaJicXRz/dMf/PiqszrQ9/3F6o\r
+       lXm8dNPn+kjrR2maqs536mUDCwU5clbmzxNIPPCtr1TiodeTwsNbD5+Zb8fTHdv5dY7S2Xbm\r
+       uDDr0yXvVN4pqh/lf7o8TePlZhvOev2vKy1LQ4LilFiKMxINtZiLihMBb3nB6s8CAAA=\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: Sat, 09 Jun 2012 19:14:58 -0000\r
+\r
+Previously, we synchronized flags to tags for any message that looked\r
+like it had maildir flags in its file name, regardless of whether it\r
+was in a maildir-like directory structure.  This was asymmetric with\r
+tag-to-flag synchronization, which only applied to messages in\r
+directories named new/ and cur/ (introduced by 95dd5fe5).\r
+\r
+This change makes our interpretation stricter and addresses this\r
+asymmetry by only synchronizing flags to tags for messages in\r
+directories named new/ or cur/.  It also prepares us to treat messages\r
+in new/ as maildir messages, even though they lack maildir flags.\r
+---\r
+ lib/message.cc |    6 +++++-\r
+ 1 file changed, 5 insertions(+), 1 deletion(-)\r
+\r
+diff --git a/lib/message.cc b/lib/message.cc\r
+index ed96477..bbac2ff 100644\r
+--- a/lib/message.cc\r
++++ b/lib/message.cc\r
+@@ -1074,7 +1074,7 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+     const char *flags;\r
+     notmuch_status_t status;\r
+     notmuch_filenames_t *filenames;\r
+-    const char *filename;\r
++    const char *filename, *dir;\r
+     char *combined_flags = talloc_strdup (message, "");\r
+     unsigned i;\r
+     int seen_maildir_info = 0;\r
+@@ -1084,6 +1084,10 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t *message)\r
+        notmuch_filenames_move_to_next (filenames))\r
+     {\r
+       filename = notmuch_filenames_get (filenames);\r
++      dir = _filename_is_in_maildir (filename);\r
++\r
++      if (! dir)\r
++          continue;\r
+ \r
+       flags = strstr (filename, ":2,");\r
+       if (! flags)\r
+-- \r
+1.7.10\r
+\r