[PATCH v3 09/20] insert: parse and apply command-line tag operations

diff --git a/cb/b2ac8c739aa03b9b0b0d1f80cf42bb46ae65b4 b/cb/b2ac8c739aa03b9b0b0d1f80cf42bb46ae65b4
new file mode 100644 (file)
index 0000000..84f08f0
--- /dev/null
+++ b/cb/b2ac8c739aa03b9b0b0d1f80cf42bb46ae65b4
@@ -0,0 +1,101 @@
+Return-Path: <novalazy@gmail.com>\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 6526F429E34\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:30 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.799\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.799 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       FREEMAIL_FROM=0.001, 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 L8q5iSqq+jH5 for <notmuch@notmuchmail.org>;\r
+       Sat, 19 Jan 2013 16:51:29 -0800 (PST)\r
+Received: from mail-pb0-f44.google.com (mail-pb0-f44.google.com\r
+       [209.85.160.44]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id E407D431FB6\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:17 -0800 (PST)\r
+Received: by mail-pb0-f44.google.com with SMTP id uo1so2676528pbc.31\r
+       for <notmuch@notmuchmail.org>; Sat, 19 Jan 2013 16:51:17 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+       h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to\r
+       :references; bh=2wGbHmmBHHNifXscxMfxkOeExRYtYyyPcudnN3AgbqA=;\r
+       b=vRnM4vXYjPlL72f5/5w8UdqfcImq0Tl4hnj6a8wliD064jZDVwbhSMgHAstxYNmDkR\r
+       3uOhFl3CEE7VVk1xZqQScBpMg1eW/dB6MPEyZYpMjvbu8a7hueIeJoiQsrf/KcHjdCUK\r
+       KvxbeA2AUWO0dWtI2GtmqOrwyRdCRxLD9QSt76/ATAn6ZJaErWcHDQfeLdLFFvyGuxub\r
+       fVJklP3hwMAi25dSA+RWY37YNFahzNq4Zau0dqpJvTWAQgnslDSlV/MUJS2ABOP4sLCd\r
+       rAxhUEBz64R782ABtBJmKtel5FWczaqGw7Bujk1pZPq5dRqG4kcAKqSqucOMrsH9tmOf\r
+       4WtA==\r
+X-Received: by 10.66.73.105 with SMTP id k9mr36420639pav.37.1358643077033;\r
+       Sat, 19 Jan 2013 16:51:17 -0800 (PST)\r
+Received: from localhost (215.42.233.220.static.exetel.com.au.\r
+       [220.233.42.215])\r
+       by mx.google.com with ESMTPS id hc4sm5803265pbc.30.2013.01.19.16.51.15\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sat, 19 Jan 2013 16:51:16 -0800 (PST)\r
+From: Peter Wang <novalazy@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3 09/20] insert: parse and apply command-line tag operations\r
+Date: Sun, 20 Jan 2013 11:49:53 +1100\r
+Message-Id: <1358643004-14522-10-git-send-email-novalazy@gmail.com>\r
+X-Mailer: git-send-email 1.7.12.1\r
+In-Reply-To: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\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, 20 Jan 2013 00:51:30 -0000\r
+\r
+Parse +tag and -tag operations on the 'insert' command-line\r
+and apply them to the inserted message in addition to new.tags.\r
+---\r
+ notmuch-insert.c | 11 +++++++++++\r
+ 1 file changed, 11 insertions(+)\r
+\r
+diff --git a/notmuch-insert.c b/notmuch-insert.c\r
+index 8388d07..b0ac174 100644\r
+--- a/notmuch-insert.c\r
++++ b/notmuch-insert.c\r
+@@ -235,7 +235,9 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+     const char **new_tags;\r
+     size_t new_tags_length;\r
+     tag_op_list_t *tag_ops;\r
++    char *query_string = NULL;\r
+     char *maildir;\r
++    int opt_index = 1;\r
+     unsigned int i;\r
+     notmuch_bool_t ret;\r
+ \r
+@@ -256,6 +258,15 @@ notmuch_insert_command (void *ctx, int argc, char *argv[])\r
+           return 1;\r
+     }\r
+ \r
++    if (parse_tag_command_line (ctx, argc - opt_index, argv + opt_index,\r
++                              &query_string, tag_ops))\r
++      return 1;\r
++\r
++    if (*query_string != '\0') {\r
++      fprintf (stderr, "Error: unexpected query string: %s\n", query_string);\r
++      return 1;\r
++    }\r
++\r
+     maildir = talloc_asprintf (ctx, "%s", db_path);\r
+     if (! maildir) {\r
+       fprintf (stderr, "Out of memory\n");\r
+-- \r
+1.7.12.1\r
+\r