--- /dev/null
+Return-Path: <m.walters@qmul.ac.uk>\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 E2C4F431E82\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 14:44:57 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -1.098\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-1.098 tagged_above=-999 required=5\r
+ tests=[DKIM_ADSP_CUSTOM_MED=0.001, FREEMAIL_FROM=0.001,\r
+ NML_ADSP_CUSTOM_MED=1.2, RCVD_IN_DNSWL_MED=-2.3] 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 1wNwuBn8WvjY for <notmuch@notmuchmail.org>;\r
+ Sat, 26 Oct 2013 14:44:52 -0700 (PDT)\r
+Received: from mail2.qmul.ac.uk (mail2.qmul.ac.uk [138.37.6.6])\r
+ (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id 15CC1431FD9\r
+ for <notmuch@notmuchmail.org>; Sat, 26 Oct 2013 14:44:52 -0700 (PDT)\r
+Received: from smtp.qmul.ac.uk ([138.37.6.40])\r
+ by mail2.qmul.ac.uk with esmtp (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1VaBf5-0006FA-NG; Sat, 26 Oct 2013 22:44:48 +0100\r
+Received: from 93-97-24-31.zone5.bethere.co.uk ([93.97.24.31] helo=localhost)\r
+ by smtp.qmul.ac.uk with esmtpsa (TLSv1:AES128-SHA:128) (Exim 4.71)\r
+ (envelope-from <m.walters@qmul.ac.uk>)\r
+ id 1VaBf5-0003pL-9t; Sat, 26 Oct 2013 22:44:47 +0100\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: Re: [PATCH 0/4] rename pick to tree\r
+In-Reply-To: <1382822481-26659-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1382822481-26659-1-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.16 (http://notmuchmail.org) Emacs/23.4.1\r
+ (x86_64-pc-linux-gnu)\r
+Date: Sat, 26 Oct 2013 22:44:45 +0100\r
+Message-ID: <87ob6blnaq.fsf@qmul.ac.uk>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Sender-Host-Address: 93.97.24.31\r
+X-QM-SPAM-Info: Sender has good ham record. :)\r
+X-QM-Body-MD5: 599c673b1ac3d333106f3ee1fe8a07bc (of first 20000 bytes)\r
+X-SpamAssassin-Score: 0.0\r
+X-SpamAssassin-SpamBar: /\r
+X-SpamAssassin-Report: The QM spam filters have analysed this message to\r
+ determine if it is\r
+ spam. We require at least 5.0 points to mark a message as spam.\r
+ This message scored 0.0 points. Summary of the scoring: \r
+ * 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail\r
+ provider * (markwalters1009[at]gmail.com)\r
+ * 0.0 AWL AWL: From: address is in the auto white-list\r
+X-QM-Scan-Virus: ClamAV says the message is clean\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, 26 Oct 2013 21:44:58 -0000\r
+\r
+\r
+Please ignore this version. There were stale files around in my git tree\r
+which meant it misses the actual key pick->tree move but all still\r
+worked (and all tests passed)!\r
+\r
+I will resend once I have tested on a fresh clone\r
+\r
+Best wishes\r
+\r
+Mark\r
+\r
+\r
+On Sat, 26 Oct 2013, Mark Walters <markwalters1009@gmail.com> wrote:\r
+> After some discussion on irc it was decided to rename "pick" to\r
+> "tree". This series implements this change. Obviously the patch is\r
+> rather large. I have split it as best as I can: the first moves all of\r
+> the lisp from the "pick" namespace to the "tree" namespace, the second\r
+> does the user facing part of the tests (ie what is printed when the\r
+> test is run), the third updates the auxillary test files (expected\r
+> outputs) and the final one moves the test itself.\r
+>\r
+> I haven't updated the documentation or moved the notmuch-pick\r
+> directory as that will all be moot once pick moves into mainline.\r
+>\r
+> For the main lisp change I piped the pick.el file through sed\r
+> 's/pick/tree/g'. Then I hand editted the result. The diff from the\r
+> hand editting is below as that may give the best clue as to any actual\r
+> changes. (The main one is to use "tree view" rather than just "tree"\r
+> in docstrings etc.)\r
+>\r
+> For any users this will mean they need to update their require\r
+> 'notmuch-pick to require 'notmuch-tree.\r
+>\r
+>\r
+> Best wishes\r
+>\r
+> Mark\r
+>\r
+>\r
+>\r
+> Mark Walters (4):\r
+> contrib: pick: move lisp names from pick to tree\r
+> pick: Change the test names and print out for pick tests\r
+> pick: rename test outputs from pick to tree\r
+> pick: rename test emacs-pick to emacs-tree\r
+>\r
+> contrib/notmuch-pick/notmuch-pick.el | 668 ++++++++++----------\r
+> contrib/notmuch-pick/run-tests.sh | 4 +-\r
+> contrib/notmuch-pick/test/emacs-pick | 210 ------\r
+> contrib/notmuch-pick/test/emacs-tree | 210 ++++++\r
+> .../pick.expected-output/notmuch-pick-show-window | 40 --\r
+> .../notmuch-pick-single-thread | 6 -\r
+> .../pick.expected-output/notmuch-pick-tag-inbox | 53 --\r
+> .../notmuch-pick-tag-inbox-tagged | 53 --\r
+> .../notmuch-pick-tag-inbox-thread-tagged | 53 --\r
+> .../tree.expected-output/notmuch-tree-show-window | 40 ++\r
+> .../notmuch-tree-single-thread | 6 +\r
+> .../tree.expected-output/notmuch-tree-tag-inbox | 53 ++\r
+> .../notmuch-tree-tag-inbox-tagged | 53 ++\r
+> .../notmuch-tree-tag-inbox-thread-tagged | 53 ++\r
+> 14 files changed, 751 insertions(+), 751 deletions(-)\r
+> delete mode 100755 contrib/notmuch-pick/test/emacs-pick\r
+> create mode 100755 contrib/notmuch-pick/test/emacs-tree\r
+> delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-show-window\r
+> delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-single-thread\r
+> delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox\r
+> delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-tagged\r
+> delete mode 100644 contrib/notmuch-pick/test/pick.expected-output/notmuch-pick-tag-inbox-thread-tagged\r
+> create mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-show-window\r
+> create mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-single-thread\r
+> create mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox\r
+> create mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-tagged\r
+> create mode 100644 contrib/notmuch-pick/test/tree.expected-output/notmuch-tree-tag-inbox-thread-tagged\r
+>\r
+> From 338fd0c981ef9ed4d5b4f7880b1e21826f7d182c Mon Sep 17 00:00:00 2001\r
+> From: Mark Walters <markwalters1009@gmail.com>\r
+> Date: Sat, 26 Oct 2013 13:48:04 +0100\r
+> Subject: [PATCH] by hand\r
+>\r
+> ---\r
+> contrib/notmuch-pick/notmuch-pick.el | 34 +++++++++++++++++-----------------\r
+> 1 files changed, 17 insertions(+), 17 deletions(-)\r
+>\r
+> diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+> index aaadad4..3b0cc0e 100644\r
+> --- a/contrib/notmuch-pick/notmuch-pick.el\r
+> +++ b/contrib/notmuch-pick/notmuch-pick.el\r
+> @@ -60,7 +60,7 @@\r
+> ("authors" . "%-20s")\r
+> ((("tree" . "%s")("subject" . "%s")) ." %-54s ")\r
+> ("tags" . "(%s)"))\r
+> - "Result formatting for Pick. Supported fields are: date,\r
+> + "Result formatting for Tree view. Supported fields are: date,\r
+> authors, subject, tree, tags. Tree means the thread tree\r
+> box graphics. The field may also be a list in which case\r
+> the formatting rules are applied recursively and then the\r
+> @@ -175,8 +175,8 @@ Note the author string should not contain\r
+> "The window of the message pane.\r
+> \r
+> It is set in both the tree buffer and the child show buffer. It\r
+> -is used to try and close the message pane when quitting tree or\r
+> -the child show buffer.")\r
+> +is used to try and close the message pane when quitting tree view\r
+> +or the child show buffer.")\r
+> (make-variable-buffer-local 'notmuch-tree-message-window)\r
+> (put 'notmuch-tree-message-window 'permanent-local t)\r
+> \r
+> @@ -252,7 +252,7 @@ FUNC."\r
+> (define-key map "R" (notmuch-tree-close-message-pane-and #'notmuch-show-reply))\r
+> (define-key map "V" (notmuch-tree-close-message-pane-and #'notmuch-show-view-raw-message))\r
+> \r
+> - ;; The main tree bindings\r
+> + ;; The main tree view bindings\r
+> (define-key map (kbd "RET") 'notmuch-tree-show-message)\r
+> (define-key map [mouse-1] 'notmuch-tree-show-message)\r
+> (define-key map "x" 'notmuch-tree-quit)\r
+> @@ -287,7 +287,7 @@ Some useful entries are:\r
+> ;; XXX This should really be a lib function but we are trying to\r
+> ;; reduce impact on the code base.\r
+> (defun notmuch-show-get-prop (prop &optional props)\r
+> - "This is a tree overridden version of notmuch-show-get-prop\r
+> + "This is a tree view overridden version of notmuch-show-get-prop\r
+> \r
+> It gets property PROP from PROPS or, if PROPS is nil, the current\r
+> message in either tree or show. This means that several functions\r
+> @@ -391,10 +391,10 @@ Does NOT change the database."\r
+> (list (notmuch-read-tag-changes (notmuch-tree-get-tags) "Tag message" "-")))\r
+> (notmuch-tree-tag tag-changes))\r
+> \r
+> -;; The next two functions close the message window before searching or\r
+> -;; treeing but they do so after the user has entered the query (in\r
+> -;; case the user was basing the query on something in the message\r
+> -;; window).\r
+> +;; The next two functions close the message window before calling\r
+> +;; notmuch-search or notmuch-tree but they do so after the user has\r
+> +;; entered the query (in case the user was basing the query on\r
+> +;; something in the message window).\r
+> \r
+> (defun notmuch-tree-to-search ()\r
+> "Run \"notmuch search\" with the given `query' and display results."\r
+> @@ -404,9 +404,9 @@ Does NOT change the database."\r
+> (notmuch-search query)))\r
+> \r
+> (defun notmuch-tree-to-tree ()\r
+> - "Run a query and display results in experimental notmuch-tree mode"\r
+> + "Run a query and display results in Tree view"\r
+> (interactive)\r
+> - (let ((query (notmuch-read-query "Notmuch tree: ")))\r
+> + (let ((query (notmuch-read-query "Notmuch tree view search: ")))\r
+> (notmuch-tree-close-message-window)\r
+> (notmuch-tree query)))\r
+> \r
+> @@ -856,7 +856,7 @@ Complete list of currently available key bindings:\r
+> (atbob (bobp)))\r
+> (goto-char (point-max))\r
+> (if (eq status 'signal)\r
+> - (insert "Incomplete search results (tree process was killed).\n"))\r
+> + (insert "Incomplete search results (tree view process was killed).\n"))\r
+> (when (eq status 'exit)\r
+> (insert "End of search results.")\r
+> (unless (= exit-status 0)\r
+> @@ -864,7 +864,7 @@ Complete list of currently available key bindings:\r
+> (insert "\n")))))))))\r
+> \r
+> (defun notmuch-tree-process-filter (proc string)\r
+> - "Process and filter the output of \"notmuch show\" (for tree)"\r
+> + "Process and filter the output of \"notmuch show\" for tree view"\r
+> (let ((results-buf (process-buffer proc))\r
+> (parse-buf (process-get proc 'parse-buf))\r
+> (inhibit-read-only t)\r
+> @@ -880,7 +880,7 @@ Complete list of currently available key bindings:\r
+> results-buf)))))\r
+> \r
+> (defun notmuch-tree-worker (basic-query &optional query-context target open-target)\r
+> - "Insert the actual tree search in the current buffer.\r
+> + "Insert the tree view of the search in the current buffer.\r
+> \r
+> This is is a helper function for notmuch-tree. The arguments are\r
+> the same as for the function notmuch-tree."\r
+> @@ -921,13 +921,13 @@ The arguments are:\r
+> is QUERY and QUERY-CONTEXT unless that does not match any messages\r
+> in which case we fall back to just QUERY.\r
+> TARGET: A message ID (with the id: prefix) that will be made\r
+> - current if it appears in the tree results.\r
+> - BUFFER-NAME: the name of the buffer to show the tree tree. If\r
+> + current if it appears in the tree view results.\r
+> + BUFFER-NAME: the name of the buffer to display the tree view. If\r
+> it is nil \"*notmuch-tree\" followed by QUERY is used.\r
+> OPEN-TARGET: If TRUE open the target message in the message pane."\r
+> (interactive)\r
+> (if (null query)\r
+> - (setq query (notmuch-read-query "Notmuch tree: ")))\r
+> + (setq query (notmuch-read-query "Notmuch tree view search: ")))\r
+> (let ((buffer (get-buffer-create (generate-new-buffer-name\r
+> (or buffer-name\r
+> (concat "*notmuch-tree-" query "*")))))\r
+> -- \r
+> 1.7.9.1\r
projects / notmuch-archives.git / commitdiff