[PATCH v2 2/2] contrib: pick: thread tagging (including archiving) implemented

diff --git a/9d/e157bf25842735da3da6f21d9801dad369e811 b/9d/e157bf25842735da3da6f21d9801dad369e811
new file mode 100644 (file)
index 0000000..40277ad
--- /dev/null
+++ b/9d/e157bf25842735da3da6f21d9801dad369e811
@@ -0,0 +1,126 @@
+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 C23DE429E43\r
+       for <notmuch@notmuchmail.org>; Thu, 13 Jun 2013 16:37:22 -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 o3glJMJ6HnkS for <notmuch@notmuchmail.org>;\r
+       Thu, 13 Jun 2013 16:37:18 -0700 (PDT)\r
+Received: from mail-ee0-f43.google.com (mail-ee0-f43.google.com\r
+ [74.125.83.43])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ CA1EB429E34   for <notmuch@notmuchmail.org>; Thu, 13 Jun 2013 16:37:15 -0700\r
+ (PDT)\r
+Received: by mail-ee0-f43.google.com with SMTP id l10so4764387eei.16\r
+       for <notmuch@notmuchmail.org>; Thu, 13 Jun 2013 16:37:14 -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:x-mailer:in-reply-to:references;\r
+       bh=s9PlFSvD719GHhbQA8nvfdMYkp4ruD2IPEKueoyaF8w=;\r
+       b=Xr3ydZG0My59EjWB+v/4WexwdKbJBL8Ye/iTNrUphnF5Q0iDrA5B0y7StAPTHy02Fh\r
+       Vss0ihvjMH2ADk9lmKiKQywwCUOuBLxdmD6rTxj3RzwS4gSVvUrNZme2Vql96S6I5U+n\r
+       3Di+fkBwZKMqpaRAkMQC/r9EX/UH+9ALE6OzgE4TbYTlsxmCBhtAFZLqZf+7mvkp9P0x\r
+       OY+3VfG25UCXwTd3KJLH9Iedvf5QGAbmSvOc3cbN46JxHy4ChMtG67w/tBLFyx/8GnmF\r
+       VJ4uuLoXXeCp8temH69jywNPSWvL/ZtnReFeC50V6+yH+5kbK3/m7fgRlbpKWMi9jODz\r
+       qQFA==\r
+X-Received: by 10.14.5.201 with SMTP id 49mr3758019eel.57.1371166634695;\r
+       Thu, 13 Jun 2013 16:37:14 -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\r
+       u11sm46884154eev.12.2013.06.13.16.37.13 for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Thu, 13 Jun 2013 16:37:13 -0700 (PDT)\r
+From: Mark Walters <markwalters1009@gmail.com>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 2/2] contrib: pick: thread tagging (including archiving)\r
+       implemented\r
+Date: Fri, 14 Jun 2013 00:36:58 +0100\r
+Message-Id: <1371166618-27196-3-git-send-email-markwalters1009@gmail.com>\r
+X-Mailer: git-send-email 1.7.9.1\r
+In-Reply-To: <1371166618-27196-1-git-send-email-markwalters1009@gmail.com>\r
+References: <1371166618-27196-1-git-send-email-markwalters1009@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: Thu, 13 Jun 2013 23:37:23 -0000\r
+\r
+Previously pick had no actions based on the entire thread: this adds\r
+some. Note in this version '*' is bound to `tag thread' which is not\r
+consistent with search or show. However it still might be the most\r
+natural thing (as it is similar to running * in the show pane).\r
+---\r
+ contrib/notmuch-pick/notmuch-pick.el |   26 ++++++++++++++++++++++++++\r
+ 1 files changed, 26 insertions(+), 0 deletions(-)\r
+\r
+diff --git a/contrib/notmuch-pick/notmuch-pick.el b/contrib/notmuch-pick/notmuch-pick.el\r
+index 8030842..642db79 100644\r
+--- a/contrib/notmuch-pick/notmuch-pick.el\r
++++ b/contrib/notmuch-pick/notmuch-pick.el\r
+@@ -179,6 +179,7 @@\r
+     (define-key map "q" 'notmuch-pick-quit)\r
+     (define-key map "x" 'notmuch-pick-quit)\r
+     (define-key map "?" 'notmuch-help)\r
++    (define-key map "A" 'notmuch-pick-archive-thread)\r
+     (define-key map "a" 'notmuch-pick-archive-message-then-next)\r
+     (define-key map "=" 'notmuch-pick-refresh-view)\r
+     (define-key map "s" 'notmuch-pick-to-search)\r
+@@ -194,6 +195,7 @@\r
+     (define-key map "|" 'notmuch-pick-pipe-message)\r
+     (define-key map "-" 'notmuch-pick-remove-tag)\r
+     (define-key map "+" 'notmuch-pick-add-tag)\r
++    (define-key map "*" 'notmuch-pick-tag-thread)\r
+     (define-key map " " 'notmuch-pick-scroll-or-next)\r
+     (define-key map "b" 'notmuch-pick-scroll-message-window-back)\r
+     map))\r
+@@ -604,6 +606,30 @@ than only the current message."\r
+            (notmuch-pick-thread-mapcar 'notmuch-pick-get-message-id)\r
+            " or "))\r
+ \r
++(defun notmuch-pick-tag-thread (&optional tag-changes)\r
++  "Tag all messages in the current thread"\r
++  (interactive)\r
++  (setq tag-changes (notmuch-tag (notmuch-pick-get-messages-ids-thread-search) tag-changes))\r
++  (notmuch-pick-thread-mapcar\r
++   (lambda () (notmuch-pick-tag-update-display tag-changes))))\r
++\r
++(defun notmuch-pick-archive-thread (&optional unarchive)\r
++  "Archive each message in thread.\r
++\r
++Archive each message currently shown by applying the tag changes\r
++in `notmuch-archive-tags' to each. If a prefix argument is given,\r
++the messages will be \"unarchived\", i.e. the tag changes in\r
++`notmuch-archive-tags' will be reversed.\r
++\r
++Note: This command is safe from any race condition of new messages\r
++being delivered to the same thread. It does not archive the\r
++entire thread, but only the messages shown in the current\r
++buffer."\r
++  (interactive "P")\r
++  (when notmuch-archive-tags\r
++    (notmuch-pick-tag-thread\r
++     (notmuch-tag-change-list notmuch-archive-tags unarchive))))\r
++\r
+ ;; Functions below here display the pick buffer itself.\r
+ \r
+ (defun notmuch-pick-clean-address (address)\r
+-- \r
+1.7.9.1\r
+\r