test: move emacs-tree test into mainline

We move the emacs-tree test and associated files into the main test
directory and add the test to the list in notmuch-test.

6 files changed, 0 insertions, 415 deletions

diff --git a/contrib/notmuch-pick/test/emacs-tree b/contrib/notmuch-pick/test/emacs-tree
deleted file mode 100755
index 05ce85d0..00000000
--- a/contrib/notmuch-pick/test/emacs-tree
+++ /dev/null
@@ -1,210 +0,0 @@
-#!/usr/bin/env bash
-
-test_description="emacs tree view interface"
-. test-lib.sh
-
-EXPECTED=$TEST_DIRECTORY/tree.expected-output
-
-add_email_corpus
-test_begin_subtest "Do we have emacs"
-test_emacs '(insert "hello\n")
-	    (test-output)'
-cat <<EOF >EXPECTED
-hello
-EOF
-test_expect_equal_file OUTPUT EXPECTED
-
-test_begin_subtest "Basic notmuch-tree view in emacs"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
-
-test_begin_subtest "Refreshed notmuch-tree view in emacs"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    (notmuch-tree-refresh-view)
-	    (notmuch-test-wait)
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
-
-# In the following tag tests we make sure the display is updated
-# correctly and, in a separate test, that the database is updated
-# correctly.
-
-test_begin_subtest "Tag message in notmuch tree view (display)"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    (forward-line)
-	    (notmuch-tree-tag (list "+test_tag"))
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-tagged
-
-test_begin_subtest "Tag message in notmuch tree view (database)"
-output=$(notmuch search --output=messages 'tag:test_tag')
-test_expect_equal "$output" "id:877h1wv7mg.fsf@inf-8657.int-evry.fr"
-
-test_begin_subtest "Untag message in notmuch tree view"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    (forward-line)
-	    (notmuch-tree-tag (list "-test_tag"))
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
-
-test_begin_subtest "Untag message in notmuch tree view (database)"
-output=$(notmuch search --output=messages 'tag:test_tag')
-test_expect_equal "$output" ""
-
-test_begin_subtest "Tag thread in notmuch tree view"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    ;; move to a sizable thread
-	    (forward-line 26)
-	    (notmuch-tree-tag-thread (list "+test_thread_tag"))
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox-thread-tagged
-
-test_begin_subtest "Tag message in notmuch tree view (database)"
-output=$(notmuch search --output=messages 'tag:test_thread_tag')
-test_expect_equal "$output" \
-"id:87ocn0qh6d.fsf@yoom.home.cworth.org
-id:20091118005040.GA25380@dottiness.seas.harvard.edu
-id:yunaayketfm.fsf@aiko.keithp.com
-id:87fx8can9z.fsf@vertex.dottedmag
-id:20091117203301.GV3165@dottiness.seas.harvard.edu
-id:87iqd9rn3l.fsf@vertex.dottedmag
-id:20091117190054.GU3165@dottiness.seas.harvard.edu"
-
-test_begin_subtest "Untag thread in notmuch tree view"
-test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-	    (require (quote notmuch-tree))
-	    (notmuch-tree "tag:inbox")
-	    (notmuch-test-wait)
-	    ;; move to the same sizable thread as above
-	    (forward-line 26)
-	    (notmuch-tree-tag-thread (list "-test_thread_tag"))
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
-
-test_begin_subtest "Untag message in notmuch tree view (database)"
-output=$(notmuch search --output=messages 'tag:test_thread_tag')
-test_expect_equal "$output" ""
-
-test_begin_subtest "Navigation of notmuch-hello to search results"
-test_emacs '(notmuch-hello)
-	    (goto-char (point-min))
-	    (re-search-forward "inbox")
-	    (widget-button-press (1- (point)))
-	    (notmuch-test-wait)
-	    (notmuch-tree-from-search-current-query)
-	    (notmuch-test-wait)
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-tag-inbox
-
-test_begin_subtest "Tree view of a single thread (from search)"
-test_emacs '(notmuch-hello)
-	    (goto-char (point-min))
-	    (re-search-forward "inbox")
-	    (widget-button-press (1- (point)))
-	    (notmuch-test-wait)
-	    (notmuch-tree-from-search-thread)
-	    (notmuch-test-wait)
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
-
-test_begin_subtest "Tree view of a single thread (from show)"
-test_emacs '(notmuch-hello)
-	    (goto-char (point-min))
-	    (re-search-forward "inbox")
-	    (widget-button-press (1- (point)))
-	    (notmuch-test-wait)
-	    (notmuch-search-show-thread)
-	    (notmuch-tree-from-show-current-query)
-	    (notmuch-test-wait)
-	    (test-output)
-	    (delete-other-windows)'
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-single-thread
-
-test_begin_subtest "Message window of tree view"
-test_emacs '(notmuch-hello)
-	    (goto-char (point-min))
-	    (re-search-forward "inbox")
-	    (widget-button-press (1- (point)))
-	    (notmuch-test-wait)
-	    (notmuch-search-next-thread)
-	    (notmuch-tree-from-search-thread)
-	    (notmuch-test-wait)
-	    (select-window notmuch-tree-message-window)
-	    (test-output)
-	    (delete-other-windows)'
-cp OUTPUT /tmp/mjwout
-test_expect_equal_file OUTPUT $EXPECTED/notmuch-tree-show-window
-
-test_begin_subtest "Stash id"
-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-tree))
-		     (notmuch-tree "id:1258498485-sup-142@elly")
-		     (notmuch-test-wait)
-		     (notmuch-show-stash-message-id)')
-test_expect_equal "$output" "\"Stashed: id:1258498485-sup-142@elly\""
-
-test_begin_subtest "Move to next matching message"
-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-tree))
-		     (notmuch-tree "from:cworth")
-		     (notmuch-test-wait)
-		     (notmuch-tree-next-matching-message)
-		     (notmuch-show-stash-message-id)')
-test_expect_equal "$output" "\"Stashed: id:878we4qdqf.fsf@yoom.home.cworth.org\""
-
-test_begin_subtest "Move to next thread"
-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-tree))
-		     (notmuch-tree "tag:inbox")
-		     (notmuch-test-wait)
-		     (forward-line 26)
-		     (notmuch-tree-next-thread)
-		     (notmuch-show-stash-message-id)')
-test_expect_equal "$output" "\"Stashed: id:1258471718-6781-1-git-send-email-dottedmag@dottedmag.net\""
-
-test_begin_subtest "Move to previous thread"
-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-tree))
-		     (notmuch-tree "tag:inbox")
-		     (notmuch-test-wait)
-		     (forward-line 26)
-		     (notmuch-tree-prev-thread)
-		     (notmuch-show-stash-message-id)')
-test_expect_equal "$output" "\"Stashed: id:20091117190054.GU3165@dottiness.seas.harvard.edu\""
-
-test_begin_subtest "Move to previous previous thread"
-output=$(test_emacs '(add-to-list (quote load-path) "'$PICK_DIR'")
-		     (require (quote notmuch-tree))
-		     (notmuch-tree "tag:inbox")
-		     (notmuch-test-wait)
-		     (forward-line 26)
-		     (notmuch-tree-prev-thread)
-		     (notmuch-tree-prev-thread)
-		     (notmuch-show-stash-message-id)')
-test_expect_equal "$output" "\"Stashed: id:1258493565-13508-1-git-send-email-keithp@keithp.com\""
-
-test_done
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
deleted file mode 100644
index e16792b8..00000000
--- a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window
+++ /dev/null
@@ -1,40 +0,0 @@
-Lars Kellogg-Stedman <lars@seas.harvard.edu> (2009-11-17) (inbox signed)
-Subject: [notmuch] Working with Maildir storage?
-To: notmuch@notmuchmail.org
-Date: Tue, 17 Nov 2009 14:00:54 -0500
-
-[ multipart/mixed ]
-[ multipart/signed ]
-[ text/plain ]
-I saw the LWN article and decided to take a look at notmuch.  I'm
-currently using mutt and mairix to index and read a collection of
-Maildir mail folders (around 40,000 messages total).
-
-notmuch indexed the messages without complaint, but my attempt at
-searching bombed out. Running, for example:
-
-  notmuch search storage
-
-Resulted in 4604 lines of errors along the lines of:
-
-  Error opening
-  /home/lars/Mail/read-messages.2008/cur/1246413773.24928_27334.hostname,U=3026:2,S:
-  Too many open files
-
-I'm curious if this is expected behavior (i.e., notmuch does not work
-with Maildir) or if something else is going on.
-
-Cheers,
-
-[ 4-line signature. Click/Enter to show. ]
--- 
-Lars Kellogg-Stedman <lars@seas.harvard.edu>
-Senior Technologist, Computing and Information Technology
-Harvard University School of Engineering and Applied Sciences
-[ application/pgp-signature ]
-[ text/plain ]
-[ 4-line signature. Click/Enter to show. ]
-_______________________________________________
-notmuch mailing list
-notmuch@notmuchmail.org
-http://notmuchmail.org/mailman/listinfo/notmuch
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
deleted file mode 100644
index c9e5ef82..00000000
--- a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread
+++ /dev/null
@@ -1,6 +0,0 @@
-  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file after parsing message	headers (inbox)
-  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)
-  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)
-  2009-11-17  Keith Packard          ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Carl Worth              ╰─► ...                                             (inbox, unread)
-End of search results.
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
deleted file mode 100644
index 484141ec..00000000
--- a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox
+++ /dev/null
@@ -1,53 +0,0 @@
-  2010-12-29  François Boulogne     ─►[aur-general] Guidelines: cp, mkdir vs install      (inbox, unread)
-  2010-12-16  Olivier Berger        ─►Essai accentué                                      (inbox, unread)
-  2009-11-18  Chris Wilson          ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox, unread)
-  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)
-  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)
-  2009-11-17  Ingmar Vanhassel      ┬►[notmuch] [PATCH] Typsos                            (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Adrian Perez de Cast  ┬►[notmuch] Introducing myself                        (inbox, signed, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Israel Herraiz        ┬►[notmuch] New to the list                           (inbox, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] What a great idea!                        (inbox, unread)
-  2009-11-17  Jan Janak             ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Aron Griffis          ┬►[notmuch] archive                                   (inbox, unread)
-  2009-11-18  Keith Packard         ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth             ╰─► ...                                              (inbox, unread)
-  2009-11-17  Keith Packard         ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove	inbox (and unread) tags (inbox, unread)
-  2009-11-18  Carl Worth            ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox, unread)
-  2009-11-17  Lars Kellogg-Stedman  ┬►[notmuch] Working with Maildir storage?             (inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       ├┬► ...                                               (inbox, signed, unread)
-  2009-11-17  Lars Kellogg-Stedman  │╰┬► ...                                              (inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       │ ├─► ...                                             (inbox, unread)
-  2009-11-17  Keith Packard         │ ╰┬► ...                                             (inbox, unread)
-  2009-11-18  Lars Kellogg-Stedman  │  ╰─► ...                                            (inbox, signed, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file after parsing message	headers (inbox, unread)
-  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)
-  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)
-  2009-11-17  Keith Packard          ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Carl Worth              ╰─► ...                                             (inbox, unread)
-  2009-11-18  Keith Packard         ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that	highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ─►[notmuch] request for pull                          (inbox, unread)
-  2009-11-18  Jjgod Jiang           ┬►[notmuch] Mac OS X/Darwin compatibility issues      (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Jjgod Jiang            ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Alexander Botero-Low    ╰─► ...                                             (inbox, unread)
-  2009-11-18  Rolland Santimano     ─►[notmuch] Link to mailing list archives ?           (inbox, unread)
-  2009-11-18  Jan Janak             ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool	subdirectories into tags (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] count_files: sort directory in inode order before	statting (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++	libs. (inbox, unread)
-  2009-11-18  Lars Kellogg-Stedman  ┬►[notmuch] "notmuch help" outputs to stderr?         (attachment, inbox, signed, unread)
-  2009-11-18  Lars Kellogg-Stedman  ╰─► ...                                               (attachment, inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       ─►[notmuch] [PATCH] Handle rename of message file     (inbox, unread)
-  2009-11-17  Alex Botero-Lowry     ┬►[notmuch] preliminary FreeBSD support               (attachment, inbox, unread)
-  2009-11-17  Carl Worth            ╰─► ...                                               (inbox, unread)
-End of search results.
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
deleted file mode 100644
index 1f75a34b..00000000
--- a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged
+++ /dev/null
@@ -1,53 +0,0 @@
-  2010-12-29  François Boulogne     ─►[aur-general] Guidelines: cp, mkdir vs install      (inbox, unread)
-  2010-12-16  Olivier Berger        ─►Essai accentué                                      (inbox, test_tag, unread)
-  2009-11-18  Chris Wilson          ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox, unread)
-  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)
-  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)
-  2009-11-17  Ingmar Vanhassel      ┬►[notmuch] [PATCH] Typsos                            (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Adrian Perez de Cast  ┬►[notmuch] Introducing myself                        (inbox, signed, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Israel Herraiz        ┬►[notmuch] New to the list                           (inbox, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] What a great idea!                        (inbox, unread)
-  2009-11-17  Jan Janak             ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Aron Griffis          ┬►[notmuch] archive                                   (inbox, unread)
-  2009-11-18  Keith Packard         ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth             ╰─► ...                                              (inbox, unread)
-  2009-11-17  Keith Packard         ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove	inbox (and unread) tags (inbox, unread)
-  2009-11-18  Carl Worth            ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox, unread)
-  2009-11-17  Lars Kellogg-Stedman  ┬►[notmuch] Working with Maildir storage?             (inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       ├┬► ...                                               (inbox, signed, unread)
-  2009-11-17  Lars Kellogg-Stedman  │╰┬► ...                                              (inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       │ ├─► ...                                             (inbox, unread)
-  2009-11-17  Keith Packard         │ ╰┬► ...                                             (inbox, unread)
-  2009-11-18  Lars Kellogg-Stedman  │  ╰─► ...                                            (inbox, signed, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file after parsing message	headers (inbox, unread)
-  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)
-  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)
-  2009-11-17  Keith Packard          ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Carl Worth              ╰─► ...                                             (inbox, unread)
-  2009-11-18  Keith Packard         ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that	highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ─►[notmuch] request for pull                          (inbox, unread)
-  2009-11-18  Jjgod Jiang           ┬►[notmuch] Mac OS X/Darwin compatibility issues      (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Jjgod Jiang            ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Alexander Botero-Low    ╰─► ...                                             (inbox, unread)
-  2009-11-18  Rolland Santimano     ─►[notmuch] Link to mailing list archives ?           (inbox, unread)
-  2009-11-18  Jan Janak             ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool	subdirectories into tags (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] count_files: sort directory in inode order before	statting (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++	libs. (inbox, unread)
-  2009-11-18  Lars Kellogg-Stedman  ┬►[notmuch] "notmuch help" outputs to stderr?         (attachment, inbox, signed, unread)
-  2009-11-18  Lars Kellogg-Stedman  ╰─► ...                                               (attachment, inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       ─►[notmuch] [PATCH] Handle rename of message file     (inbox, unread)
-  2009-11-17  Alex Botero-Lowry     ┬►[notmuch] preliminary FreeBSD support               (attachment, inbox, unread)
-  2009-11-17  Carl Worth            ╰─► ...                                               (inbox, unread)
-End of search results.
diff --git a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged b/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
deleted file mode 100644
index a7aba6e2..00000000
--- a/contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged
+++ /dev/null
@@ -1,53 +0,0 @@
-  2010-12-29  François Boulogne     ─►[aur-general] Guidelines: cp, mkdir vs install      (inbox, unread)
-  2010-12-16  Olivier Berger        ─►Essai accentué                                      (inbox, unread)
-  2009-11-18  Chris Wilson          ─►[notmuch] [PATCH 1/2] Makefile: evaluate pkg-config once (inbox, unread)
-  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)
-  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)
-  2009-11-17  Ingmar Vanhassel      ┬►[notmuch] [PATCH] Typsos                            (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Adrian Perez de Cast  ┬►[notmuch] Introducing myself                        (inbox, signed, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Israel Herraiz        ┬►[notmuch] New to the list                           (inbox, unread)
-  2009-11-18  Keith Packard         ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] What a great idea!                        (inbox, unread)
-  2009-11-17  Jan Janak             ├─► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Jan Janak             ┬►[notmuch] [PATCH] Older versions of install do not support -C. (inbox, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, unread)
-  2009-11-17  Aron Griffis          ┬►[notmuch] archive                                   (inbox, unread)
-  2009-11-18  Keith Packard         ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Carl Worth             ╰─► ...                                              (inbox, unread)
-  2009-11-17  Keith Packard         ┬►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove	inbox (and unread) tags (inbox, unread)
-  2009-11-18  Carl Worth            ╰─►[notmuch] [PATCH] Make notmuch-show 'X' (and 'x') commands remove inbox (and unread) tags (inbox, unread)
-  2009-11-17  Lars Kellogg-Stedman  ┬►[notmuch] Working with Maildir storage?             (inbox, signed, test_thread_tag, unread)
-  2009-11-17  Mikhail Gusarov       ├┬► ...                                               (inbox, signed, test_thread_tag, unread)
-  2009-11-17  Lars Kellogg-Stedman  │╰┬► ...                                              (inbox, signed, test_thread_tag, unread)
-  2009-11-17  Mikhail Gusarov       │ ├─► ...                                             (inbox, test_thread_tag, unread)
-  2009-11-17  Keith Packard         │ ╰┬► ...                                             (inbox, test_thread_tag, unread)
-  2009-11-18  Lars Kellogg-Stedman  │  ╰─► ...                                            (inbox, signed, test_thread_tag, unread)
-  2009-11-18  Carl Worth            ╰─► ...                                               (inbox, test_thread_tag, unread)
-  2009-11-17  Mikhail Gusarov       ┬►[notmuch] [PATCH 1/2] Close message file after parsing message	headers (inbox, unread)
-  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)
-  2009-11-17  Carl Worth            ╰┬►[notmuch] [PATCH 1/2] Close message file after parsing message headers (inbox, unread)
-  2009-11-17  Keith Packard          ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Carl Worth              ╰─► ...                                             (inbox, unread)
-  2009-11-18  Keith Packard         ┬►[notmuch] [PATCH] Create a default notmuch-show-hook that	highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰─►[notmuch] [PATCH] Create a default notmuch-show-hook that highlights URLs and uses word-wrap (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ─►[notmuch] request for pull                          (inbox, unread)
-  2009-11-18  Jjgod Jiang           ┬►[notmuch] Mac OS X/Darwin compatibility issues      (inbox, unread)
-  2009-11-18  Alexander Botero-Low  ╰┬► ...                                               (inbox, unread)
-  2009-11-18  Jjgod Jiang            ╰┬► ...                                              (inbox, unread)
-  2009-11-18  Alexander Botero-Low    ╰─► ...                                             (inbox, unread)
-  2009-11-18  Rolland Santimano     ─►[notmuch] Link to mailing list archives ?           (inbox, unread)
-  2009-11-18  Jan Janak             ─►[notmuch] [PATCH] notmuch new: Support for conversion of spool	subdirectories into tags (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] count_files: sort directory in inode order before	statting (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH 2/2] Read mail directory in inode number order (inbox, unread)
-  2009-11-18  Stewart Smith         ─►[notmuch] [PATCH] Fix linking with gcc to use g++ to link in C++	libs. (inbox, unread)
-  2009-11-18  Lars Kellogg-Stedman  ┬►[notmuch] "notmuch help" outputs to stderr?         (attachment, inbox, signed, unread)
-  2009-11-18  Lars Kellogg-Stedman  ╰─► ...                                               (attachment, inbox, signed, unread)
-  2009-11-17  Mikhail Gusarov       ─►[notmuch] [PATCH] Handle rename of message file     (inbox, unread)
-  2009-11-17  Alex Botero-Lowry     ┬►[notmuch] preliminary FreeBSD support               (attachment, inbox, unread)
-  2009-11-17  Carl Worth            ╰─► ...                                               (inbox, unread)
-End of search results.