--- /dev/null
+Return-Path: <markwalters1009@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 28BA3431FD6\r
+ for <notmuch@notmuchmail.org>; Tue, 3 Sep 2013 07:05:15 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.201\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.201 tagged_above=-999 required=5\r
+ tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+ FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001,\r
+ 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 Gw9K2iTH9wcL for <notmuch@notmuchmail.org>;\r
+ Tue, 3 Sep 2013 07:05:09 -0700 (PDT)\r
+Received: from mail-wg0-f41.google.com (mail-wg0-f41.google.com\r
+ [74.125.82.41]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client\r
+ certificate requested) by olra.theworths.org (Postfix) with ESMTPS id\r
+ A5406431FCF for <notmuch@notmuchmail.org>; Tue, 3 Sep 2013 07:05:08 -0700\r
+ (PDT)\r
+Received: by mail-wg0-f41.google.com with SMTP id a12so1306245wgh.2\r
+ for <notmuch@notmuchmail.org>; Tue, 03 Sep 2013 07:05:07 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:in-reply-to:references\r
+ :mime-version:content-type:content-transfer-encoding;\r
+ bh=Sm/or4pRJefEn5534WLvX8fjUBXeBP7YciNTC/ZiyT4=;\r
+ b=hHygTxpa20L9lLvhyqH6OJlsUt1IjCjVsLTlHweaUPrNPRKv1uG1k9uIK3KQHTLMxU\r
+ sEYT4AiGSS6ZVKxuPXgvFGkltFOwtOPs6NloxQfQ6wZptQftkUBXhQFu+PMv8up2VmRG\r
+ OAYW1QuEvl3ez/wSu6zg0vW4qtGIvs7sdxlqwisrlWGIs3htikgXnt9Evma2YsarsIVY\r
+ Z97Vpllwd9BBNGyshWK+UX5NeFXUe2YtV6LvSzA5tVeXADDSKjjWgiBDMBRZcIjr57+1\r
+ knYXuORbvzTlCz8Eg/4xkeMegr6v+kZjSwO3P71FgClOB1gIIQmBEPWbZnSKm0T6JG1Y\r
+ Bp+w==\r
+X-Received: by 10.180.91.11 with SMTP id ca11mr14727923wib.2.1378217107379;\r
+ Tue, 03 Sep 2013 07:05:07 -0700 (PDT)\r
+Received: from localhost (93-97-24-31.zone5.bethere.co.uk. [93.97.24.31])\r
+ by mx.google.com with ESMTPSA id b13sm25970254wic.9.1969.12.31.16.00.00\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Tue, 03 Sep 2013 07:05:06 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 1/4] contrib: pick: test: tag/untag single message\r
+Date: Tue, 3 Sep 2013 15:04:57 +0100\r
+Message-Id: <1378217100-27533-2-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1378217100-27533-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1378217100-27533-1-git-send-email-markwalters1009@gmail.com>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=UTF-8\r
+Content-Transfer-Encoding: 8bit\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: Tue, 03 Sep 2013 14:05:15 -0000\r
+\r
+---\r
+ contrib/notmuch-pick/test/emacs-pick | 34 +++++++++++++\r
+ .../notmuch-pick-tag-inbox-tagged | 53 ++++++++++++++++++++\r
+ 2 files changed, 87 insertions(+), 0 deletions(-)\r
+ create mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged\r
+\r
+diff --git a/contrib/notmuch-pick/test/emacs-pick b/contrib/notmuch-pick/test/emacs-pick\r
+index 37f974a..909f76a 100755\r
+--- a/contrib/notmuch-pick/test/emacs-pick\r
++++ b/contrib/notmuch-pick/test/emacs-pick\r
+@@ -34,6 +34,40 @@ test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
+ (delete-other-windows)'\r
+ test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
+ \r
++# In the following tag tests we make sure the display is updated\r
++# correctly and, in a separate test, that the database is updated\r
++# correctly.\r
++\r
++test_begin_subtest "Tag message in notmuch pick view (display)"\r
++test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
++ (require (quote notmuch-pick))\r
++ (notmuch-pick "tag:inbox")\r
++ (notmuch-test-wait)\r
++ (forward-line)\r
++ (notmuch-pick-tag "+test_tag")\r
++ (test-output)\r
++ (delete-other-windows)'\r
++test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox-tagged\r
++\r
++test_begin_subtest "Tag message in notmuch pick view (database)"\r
++output=$(notmuch search --output=messages 'tag:test_tag')\r
++test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"\r
++\r
++test_begin_subtest "Untag message in notmuch pick view"\r
++test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")\r
++ (require (quote notmuch-pick))\r
++ (notmuch-pick "tag:inbox")\r
++ (notmuch-test-wait)\r
++ (forward-line)\r
++ (notmuch-pick-tag "-test_tag")\r
++ (test-output)\r
++ (delete-other-windows)'\r
++test_expect_equal_file OUTPUT $EXPECTED/notmuch-pick-tag-inbox\r
++\r
++test_begin_subtest "Untag message in notmuch pick view (database)"\r
++output=$(notmuch search --output=messages 'tag:test_tag')\r
++test_expect_equal "$output" ""\r
++\r
+ test_begin_subtest "Navigation of notmuch-hello to search results"\r
+ test_emacs '(notmuch-hello)\r
+ (goto-char (point-min))\r
+diff --git a/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged\r
+new file mode 100644\r
+index 0000000..1f75a34\r
+--- /dev/null\r
++++ b/contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged\r
+@@ -0,0 +1,53 @@\r
++ 2010-12-29 François Boulogne ─►[aur-general] Guidelines: cp, mkdir vs install (inbox, unread)\r
++ 2010-12-16 Olivier Berger ─►Essai accentué (inbox, test_tag, unread)\r
++ 2009-11-18 Chris Wilson ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox, unread)\r
++ 2009-11-18 Alex Botero-Lowry ┬►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (attachment, inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Error out if no query is supplied to search instead of going into an infinite loop (inbox, unread)\r
++ 2009-11-17 Ingmar Vanhassel ┬►[notmuch] [PATCH] Typsos (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Adrian Perez de Cast ┬►[notmuch] Introducing myself (inbox, signed, unread)\r
++ 2009-11-18 Keith Packard ├─► ... (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Israel Herraiz ┬►[notmuch] New to the list (inbox, unread)\r
++ 2009-11-18 Keith Packard ├─► ... (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Jan Janak ┬►[notmuch] What a great idea! (inbox, unread)\r
++ 2009-11-17 Jan Janak ├─► ... (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Jan Janak ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Aron Griffis ┬►[notmuch] archive (inbox, unread)\r
++ 2009-11-18 Keith Packard ╰┬► ... (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Keith Packard ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox, unread)\r
++ 2009-11-17 Lars Kellogg-Stedman ┬►[notmuch] Working with Maildir storage? (inbox, signed, unread)\r
++ 2009-11-17 Mikhail Gusarov ├┬► ... (inbox, signed, unread)\r
++ 2009-11-17 Lars Kellogg-Stedman │╰┬► ... (inbox, signed, unread)\r
++ 2009-11-17 Mikhail Gusarov │ ├─► ... (inbox, unread)\r
++ 2009-11-17 Keith Packard │ ╰┬► ... (inbox, unread)\r
++ 2009-11-18 Lars Kellogg-Stedman │ ╰─► ... (inbox, signed, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-17 Mikhail Gusarov ┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)\r
++ 2009-11-17 Mikhail Gusarov ├─►[notmuch] [PATCH 2/2] Include <stdint.h> to get uint32_t in C++ file with gcc 4.4 (inbox, unread)\r
++ 2009-11-17 Carl Worth ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)\r
++ 2009-11-17 Keith Packard ╰┬► ... (inbox, unread)\r
++ 2009-11-18 Carl Worth ╰─► ... (inbox, unread)\r
++ 2009-11-18 Keith Packard ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)\r
++ 2009-11-18 Alexander Botero-Low ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)\r
++ 2009-11-18 Alexander Botero-Low ─►[notmuch] request for pull (inbox, unread)\r
++ 2009-11-18 Jjgod Jiang ┬►[notmuch] Mac OS X/Darwin compatibility issues (inbox, unread)\r
++ 2009-11-18 Alexander Botero-Low ╰┬► ... (inbox, unread)\r
++ 2009-11-18 Jjgod Jiang ╰┬► ... (inbox, unread)\r
++ 2009-11-18 Alexander Botero-Low ╰─► ... (inbox, unread)\r
++ 2009-11-18 Rolland Santimano ─►[notmuch] Link to mailing list archives ? (inbox, unread)\r
++ 2009-11-18 Jan Janak ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool subdirectories into tags (inbox, unread)\r
++ 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] count_files: sort directory in inode order before statting (inbox, unread)\r
++ 2009-11-18 Stewart Smith ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox, unread)\r
++ 2009-11-18 Stewart Smith ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++ libs. (inbox, unread)\r
++ 2009-11-18 Lars Kellogg-Stedman ┬►[notmuch] "notmuch help" outputs to stderr? (attachment, inbox, signed, unread)\r
++ 2009-11-18 Lars Kellogg-Stedman ╰─► ... (attachment, inbox, signed, unread)\r
++ 2009-11-17 Mikhail Gusarov ─►[notmuch] [PATCH] Handle rename of message file (inbox, unread)\r
++ 2009-11-17 Alex Botero-Lowry ┬►[notmuch] preliminary FreeBSD support (attachment, inbox, unread)\r
++ 2009-11-17 Carl Worth ╰─► ... (inbox, unread)\r
++End of search results.\r
+-- \r
+1.7.9.1\r
+\r