[PATCH 2/2] insert: respect maildir.synchronize_flags

diff --git a/c5/3c9f54262a5d1c049cac94cd293603cb1497d5 b/c5/3c9f54262a5d1c049cac94cd293603cb1497d5
new file mode 100644 (file)
index 0000000..cf3b1d7
--- /dev/null
+++ b/c5/3c9f54262a5d1c049cac94cd293603cb1497d5
@@ -0,0 +1,164 @@
+Return-Path: <jani@nikula.org>\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 2D441431FCB\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Jan 2014 07:20:27 -0800 (PST)\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 lgO83u2RzkDi for <notmuch@notmuchmail.org>;\r
+       Wed,  1 Jan 2014 07:20:22 -0800 (PST)\r
+Received: from mail-ea0-f175.google.com (mail-ea0-f175.google.com\r
+       [209.85.215.175]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 3E245431FC2\r
+       for <notmuch@notmuchmail.org>; Wed,  1 Jan 2014 07:20:20 -0800 (PST)\r
+Received: by mail-ea0-f175.google.com with SMTP id z10so5862824ead.6\r
+       for <notmuch@notmuchmail.org>; Wed, 01 Jan 2014 07:20:19 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+       :references;\r
+       bh=MGz2lHZEQsnOpII6lA9P1bI3maRf6BCg2qvEQnVBWYk=;\r
+       b=Moob3M+DjYPBDjEOTsvkuSQGNGNztwdc4JJBB3yBYee051LH9neH3SQDl8dgYtkhDY\r
+       udaWyuq+T98U43ov6AaUGelF+McJYqg0gY6HEFSfktCOG8TXKRZOyI9m10F7+ZSJgJey\r
+       6sTJZastCuXCV9zFd+Z3MXq7qH84+3HGIgm2Qs6DmPAZr+d7geVJcUTJSvmo4ygLWI+l\r
+       D5IgrSkvOvRSEv7/hWOTmT3nAkz1QtITTVu/3wRxi+SY2Xl7FUwkWbswoitrm1bZyKfT\r
+       08m0HaUxJKaHhtxPfvir0eBQoBMio5Vamx321qH9EbtfHAVntXGN6/VVbC8SEJCFrC59\r
+       EY3g==\r
+X-Gm-Message-State:\r
+ ALoCoQn+dZKHcCLaF+/Lcy53R7RET/qvP6tGIa+NsBCi5UG/J9kKGA3T2+NriDYldnzMDruvkNDj\r
+X-Received: by 10.14.205.201 with SMTP id j49mr11544528eeo.85.1388589619104;\r
+       Wed, 01 Jan 2014 07:20:19 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91]) by mx.google.com with ESMTPSA id\r
+       o1sm127844319eea.10.2014.01.01.07.20.17 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Wed, 01 Jan 2014 07:20:18 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/2] insert: respect maildir.synchronize_flags\r
+Date: Wed,  1 Jan 2014 17:20:14 +0200\r
+Message-Id: <1388589614-19671-2-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <1388589614-19671-1-git-send-email-jani@nikula.org>\r
+References: <1388589614-19671-1-git-send-email-jani@nikula.org>\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: Wed, 01 Jan 2014 15:20:27 -0000\r
+\r
+Don't synchronize maildir flags if the user doesn't want it.\r
+---\r
+ notmuch-insert.c | 24 ++++++++++++++++--------\r
+ test/insert      |  1 -\r
+ 2 files changed, 16 insertions(+), 9 deletions(-)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 2207b1e..55384e3 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -295,7 +295,7 @@ copy_stdin (int fdin, int fdout)\r
+  * The file is renamed to encode notmuch tags as maildir flags. */\r
+ static void\r
+ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+-                    tag_op_list_t *tag_ops)\r
++                    tag_op_list_t *tag_ops, notmuch_bool_t synchronize_flags)\r
+ {\r
+     notmuch_message_t *message;\r
+     notmuch_status_t status;\r
+@@ -323,11 +323,15 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+ \r
+     if (status == NOTMUCH_STATUS_DUPLICATE_MESSAGE_ID) {\r
+       /* Don't change tags of an existing message. */\r
+-      status = notmuch_message_tags_to_maildir_flags (message);\r
+-      if (status != NOTMUCH_STATUS_SUCCESS)\r
+-          fprintf (stderr, "Error: failed to sync tags to maildir flags\n");\r
++      if (synchronize_flags) {\r
++          status = notmuch_message_tags_to_maildir_flags (message);\r
++          if (status != NOTMUCH_STATUS_SUCCESS)\r
++              fprintf (stderr, "Error: failed to sync tags to maildir flags\n");\r
++      }\r
+     } else {\r
+-      tag_op_list_apply (message, tag_ops, TAG_FLAG_MAILDIR_SYNC);\r
++      tag_op_flag_t flags = synchronize_flags ? TAG_FLAG_MAILDIR_SYNC : 0;\r
++\r
++      tag_op_list_apply (message, tag_ops, flags);\r
+     }\r
+ \r
+     notmuch_message_destroy (message);\r
+@@ -335,7 +339,8 @@ add_file_to_database (notmuch_database_t *notmuch, const char *path,\r
+ \r
+ static notmuch_bool_t\r
+ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+-              const char *dir, tag_op_list_t *tag_ops)\r
++              const char *dir, tag_op_list_t *tag_ops,\r
++              notmuch_bool_t synchronize_flags)\r
+ {\r
+     char *tmppath;\r
+     char *newpath;\r
+@@ -377,7 +382,7 @@ insert_message (void *ctx, notmuch_database_t *notmuch, int fdin,\r
+ \r
+     /* Even if adding the message to the notmuch database fails,\r
+      * the message is on disk and we consider the delivery completed. */\r
+-    add_file_to_database (notmuch, newpath, tag_ops);\r
++    add_file_to_database (notmuch, newpath, tag_ops, synchronize_flags);\r
+ \r
+     return TRUE;\r
+ \r
+@@ -400,6 +405,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])\r
+     char *query_string = NULL;\r
+     const char *folder = NULL;\r
+     notmuch_bool_t create_folder = FALSE;\r
++    notmuch_bool_t synchronize_flags;\r
+     const char *maildir;\r
+     int opt_index;\r
+     unsigned int i;\r
+@@ -420,6 +426,7 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])\r
+ \r
+     db_path = notmuch_config_get_database_path (config);\r
+     new_tags = notmuch_config_get_new_tags (config, &new_tags_length);\r
++    synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config);\r
+ \r
+     tag_ops = tag_op_list_create (config);\r
+     if (tag_ops == NULL) {\r
+@@ -471,7 +478,8 @@ notmuch_insert_command (notmuch_config_t *config, int argc, char *argv[])\r
+                              NOTMUCH_DATABASE_MODE_READ_WRITE, &notmuch))\r
+       return 1;\r
+ \r
+-    ret = insert_message (config, notmuch, STDIN_FILENO, maildir, tag_ops);\r
++    ret = insert_message (config, notmuch, STDIN_FILENO, maildir, tag_ops,\r
++                        synchronize_flags);\r
+ \r
+     notmuch_database_destroy (notmuch);\r
+ \r
+diff --git a/test/insert b/test/insert\r
+index 9283e70..e8dc4c0 100755\r
+--- a/test/insert\r
++++ b/test/insert\r
+@@ -114,7 +114,6 @@ dirname=$(dirname "$output")\r
+ test_expect_equal "$dirname" "$MAIL_DIR/cur"\r
+ \r
+ test_begin_subtest "Insert message with maildir sync off goes to new/"\r
+-test_subtest_known_broken\r
+ OLDCONFIG=$(notmuch config get maildir.synchronize_flags)\r
+ notmuch config set maildir.synchronize_flags false\r
+ gen_insert_msg\r
+-- \r
+1.8.5.2\r
+\r