From e5689ae81242b8f0e60b18c4f43c96b6bbe773f5 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Wed, 12 Feb 2014 20:21:23 +1900 Subject: [PATCH] Re: [PATCH 4/7] emacs: show: mark tags changed since buffer loaded --- 69/377ccb738178c6d935e6c1fc75ac69ac2d202a | 280 ++++++++++++++++++++++ 1 file changed, 280 insertions(+) create mode 100644 69/377ccb738178c6d935e6c1fc75ac69ac2d202a diff --git a/69/377ccb738178c6d935e6c1fc75ac69ac2d202a b/69/377ccb738178c6d935e6c1fc75ac69ac2d202a new file mode 100644 index 000000000..3c983126c --- /dev/null +++ b/69/377ccb738178c6d935e6c1fc75ac69ac2d202a @@ -0,0 +1,280 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id 1B3BA431FC0 + for ; Tue, 11 Feb 2014 17:21:38 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: -0.7 +X-Spam-Level: +X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5 + tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id Z9LTdCjKnMat for ; + Tue, 11 Feb 2014 17:21:30 -0800 (PST) +Received: from dmz-mailsec-scanner-2.mit.edu (dmz-mailsec-scanner-2.mit.edu + [18.9.25.13]) + (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 56CB6431FBD + for ; Tue, 11 Feb 2014 17:21:30 -0800 (PST) +X-AuditID: 1209190d-f79776d000000ce9-6e-52facc97d1e1 +Received: from mailhub-auth-4.mit.edu ( [18.7.62.39]) + (using TLS with cipher AES256-SHA (256/256 bits)) + (Client did not present a certificate) + by dmz-mailsec-scanner-2.mit.edu (Symantec Messaging Gateway) with SMTP + id 06.21.03305.79CCAF25; Tue, 11 Feb 2014 20:21:27 -0500 (EST) +Received: from outgoing.mit.edu (outgoing-auth-1.mit.edu [18.9.28.11]) + by mailhub-auth-4.mit.edu (8.13.8/8.9.2) with ESMTP id s1C1LQuZ024038; + Tue, 11 Feb 2014 20:21:27 -0500 +Received: from awakening.csail.mit.edu (awakening.csail.mit.edu [18.26.4.91]) + (authenticated bits=0) + (User authenticated as amdragon@ATHENA.MIT.EDU) + by outgoing.mit.edu (8.13.8/8.12.4) with ESMTP id s1C1LNDh001937 + (version=TLSv1/SSLv3 cipher=DHE-RSA-AES128-SHA bits=128 verify=NOT); + Tue, 11 Feb 2014 20:21:25 -0500 +Received: from amthrax by awakening.csail.mit.edu with local (Exim 4.80) + (envelope-from ) + id 1WDOVv-0003Ot-Fi; Tue, 11 Feb 2014 20:21:23 -0500 +From: Austin Clements +To: Mark Walters , notmuch@notmuchmail.org +Subject: Re: [PATCH 4/7] emacs: show: mark tags changed since buffer loaded +In-Reply-To: <1390087855-26194-5-git-send-email-markwalters1009@gmail.com> +References: <1390087855-26194-1-git-send-email-markwalters1009@gmail.com> + <1390087855-26194-5-git-send-email-markwalters1009@gmail.com> +User-Agent: Notmuch/0.17~rc2+14~g06f47e0 (http://notmuchmail.org) Emacs/23.4.1 + (i486-pc-linux-gnu) +Date: Tue, 11 Feb 2014 20:21:23 -0500 +Message-ID: <87ob2dm8h8.fsf@awakening.csail.mit.edu> +MIME-Version: 1.0 +Content-Type: text/plain; charset=us-ascii +X-Brightmail-Tracker: + H4sIAAAAAAAAA+NgFnrIIsWRmVeSWpSXmKPExsUixG6nrjv9zK8ggzPvdC1Wz+WxuH5zJrMD + k8fOWXfZPZ6tusUcwBTFZZOSmpNZllqkb5fAlXF54luWgvNOFWs7n7E1ML4w6WLk5JAQMJGY + 8OESC4QtJnHh3no2EFtIYDaTxIWZGl2MXED2RkaJhydPMEE4p5kkGm8fYIZwljBKzLs4hR2k + hU1AQ2Lb/uWMILaIgKvE02+fmUFsYQFviUu3dzKB2JwCXhI37k1igWhuZ5R4vP8/WEJUIEni + 9NTfrCA2i4CqxIU558Du4AW6b8q1KawQtqDEyZlPwG5lFtCSuPHvJdMERoFZSFKzkKQWMDKt + YpRNya3SzU3MzClOTdYtTk7My0st0jXSy80s0UtNKd3ECApJTkneHYzvDiodYhTgYFTi4WXw + /BUkxJpYVlyZe4hRkoNJSZQ34BhQiC8pP6UyI7E4I76oNCe1+BCjBAezkgiv/gmgHG9KYmVV + alE+TEqag0VJnLfWAiglkJ5YkpqdmlqQWgSTleHgUJLgvXQKKCtYlJqeWpGWmVOCkGbi4AQZ + zgM0/A9IDW9xQWJucWY6RP4Uo6KUOO8ckIQASCKjNA+uF5YyXjGKA70izHsYpIoHmG7gul8B + DWYCGtyfDTa4JBEhJdXAGLLzncau+RUBXMHP5laHR/lGXtO/7JV1sLirsatO6j9L8OL0tneV + 2z493CswianwQefZi0bzNi5681zRajaLzHYz05zgl/8ufk2f6lwY4Vc5pbc89dac9OkPq1f5 + NJVd2bQu/4pFnkjVVhcuFxX3VtGw2W4Pz+19wmxxRe70Q9Xtf8T26R/YrsRSnJFoqMVcVJwI + ANZ38p70AgAA +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 12 Feb 2014 01:21:38 -0000 + +On Sat, 18 Jan 2014, Mark Walters wrote: +> This allows (and requires) the original-tags to be passed along with +> the current-tags to be passed to notmuch-tag-format-tags. This allows +> the tag formatting to show added and deleted tags.By default a removed +> tag is displayed with strike-through in red (if strike-through is not +> available, eg on a terminal, inverse video is used instead) and an +> added tag is displayed underlined in green. +> +> If the caller does not wish to use the new feature it can pass +> current-tags for both arguments and, at this point, we do exactly that +> in the three callers of this function. +> +> Note, we cannot tidily allow original-tags to be optional because we would +> need to distinguish nil meaning "we are not specifying original-tags" +> from nil meaning there were no original-tags (an empty list). +> +> We use this in subsequent patches to make it clear when a message was +> unread when you first loaded a show buffer (previously the unread tag +> could be removed before a user realised that it had been unread). +> +> The code adds into the existing tag formatting code. The user can +> specify exactly how a tag should be displayed normally, when deleted, +> or when added. For convenience an entry for the empty string in the +> notmuch-tag-formats (and the corresponding notmuch-tag-deleted-formats +> notmuch-tag-added-formats) is applied to all tags which do not have an +> explicit match. +> +> This means that a user can tell notmuch not to show deleted tags at +> all by setting notmuch-tag-deleted-formats to +> '(("" nil)) +> or not to show any deleted tags except "unread" by setting it to +> '(("" nil) +> ("unread" (propertize tag 'face '(strike-through "red")))) +> +> All the variables are customizable; however, more complicated cases +> like changing the face depending on the type of display will require +> custom lisp. +> +> Currently this overrides notmuch-tag-deleted-formats for the tests +> setting it to '(("" nil)) so that they get removed from the display +> and, thus, all tests still pass. +> --- +> emacs/notmuch-show.el | 4 ++-- +> emacs/notmuch-tag.el | 32 +++++++++++++++++++++++++------- +> emacs/notmuch-tree.el | 2 +- +> emacs/notmuch.el | 2 +- +> test/test-lib.el | 4 ++++ +> 5 files changed, 33 insertions(+), 11 deletions(-) +> +> diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el +> index 1ac80ca..1ce56f9 100644 +> --- a/emacs/notmuch-show.el +> +++ b/emacs/notmuch-show.el +> @@ -344,7 +344,7 @@ operation on the contents of the current buffer." +> (if (re-search-forward "(\\([^()]*\\))$" (line-end-position) t) +> (let ((inhibit-read-only t)) +> (replace-match (concat "(" +> - (notmuch-tag-format-tags tags) +> + (notmuch-tag-format-tags tags tags) +> ")")))))) +> +> (defun notmuch-clean-address (address) +> @@ -423,7 +423,7 @@ message at DEPTH in the current thread." +> " (" +> date +> ") (" +> - (notmuch-tag-format-tags tags) +> + (notmuch-tag-format-tags tags tags) +> ")\n") +> (overlay-put (make-overlay start (point)) 'face 'notmuch-message-summary-face))) +> +> diff --git a/emacs/notmuch-tag.el b/emacs/notmuch-tag.el +> index 9757a0e..6bc47fb 100644 +> --- a/emacs/notmuch-tag.el +> +++ b/emacs/notmuch-tag.el +> @@ -164,10 +164,25 @@ This can be used with `notmuch-tag-format-image-data'." +> +> ") +> +> -(defun notmuch-tag-format-tag (tag) +> - "Format TAG by looking into `notmuch-tag-formats'." +> - (let ((formats (or (assoc tag notmuch-tag-formats) +> - (assoc "" notmuch-tag-formats)))) +> +(defun notmuch-tag-format-tag (tags orig-tags tag) +> + "Format TAG by looking into `notmuch-tag-formats'. +> + +> +TAGS and ORIG-TAGS are lists of the current tags and the original +> +tags; tags which have been deleted (i.e., are in ORIG-TAGS but +> +are not in TAGS) are shown using formats from +> +`notmuch-tag-deleted-formats'; tags which have been added (i.e., +> +are in TAGS but are not in ORIG-TAGS) are shown using formats +> +from `notmuch-tag-added-formats' and tags which have not been +> +changed (the normal case) are shown using formats from +> +`notmuch-tag-formats'" +> + (let* ((status-formats (cond ((and (member tag tags) (member tag orig-tags)) +> + notmuch-tag-formats) +> + ((not (member tag tags)) +> + notmuch-tag-deleted-formats) +> + ((not (member tag orig-tags)) +> + notmuch-tag-added-formats))) +> + (formats (or (assoc tag status-formats) +> + (assoc "" status-formats)))) + +I would expect this to be cumulative. That is, I would want added and +deleted tags to have my regular `notmuch-tag-formats' formatting in +addition to extra formatting specified by +`notmuch-tag-{added,deleted}-formats' (especially if, for example, it's +replaced with an image). + +I think this should just be a matter of something like + (let ((formats + (append + (notmuch-tag--get-format tag notmuch-tag-formats) + (cond ((not (member tag tags)) + (notmuch-tag--get-format tag notmuch-tag-deleted-formats)) + ((not (member tag orig-tags) + (notmuch-tag--get-format tag notmuch-tag-added-formats))))))) + ...) +where notmuch-tag--get-format is something I made up to abstract the +assoc (or the regexp lookup). This also has the benefit of reducing the +number of member tests. + +> (cond +> ((null formats) ;; - Tag not in `notmuch-tag-formats', +> tag) ;; the format is the tag itself. +> @@ -178,13 +193,16 @@ This can be used with `notmuch-tag-format-image-data'." +> (dolist (format (cdr formats) tag) +> (setq tag (eval format)))))))) +> +> -(defun notmuch-tag-format-tags (tags &optional face) +> +(defun notmuch-tag-format-tags (tags orig-tags &optional face) +> "Return a string representing formatted TAGS." +> - (let ((face (or face 'notmuch-tag-face))) +> + (let ((face (or face 'notmuch-tag-face)) +> + (all-tags (sort (delete-dups (append tags orig-tags)) #'string<))) + +This may mutate orig-tags. It's not obvious to me that's okay. You +could use remove-duplicates from cl. (I'm surprised I can't find a +uniq-like function in cl, which would save the O(n^2) operation, but I +doubt it matters.) + +> (notmuch-combine-face-text-property-string +> (mapconcat #'identity +> ;; nil indicated that the tag was deliberately hidden +> - (delq nil (mapcar #'notmuch-tag-format-tag tags)) +> + (delq nil (mapcar +> + (apply-partially #'notmuch-tag-format-tag tags orig-tags) +> + all-tags)) +> " ") +> face +> t))) +> diff --git a/emacs/notmuch-tree.el b/emacs/notmuch-tree.el +> index 4f2ac02..b37e2cd 100644 +> --- a/emacs/notmuch-tree.el +> +++ b/emacs/notmuch-tree.el +> @@ -704,7 +704,7 @@ unchanged ADDRESS if parsing fails." +> (face (if match +> 'notmuch-tree-match-tag-face +> 'notmuch-tree-no-match-tag-face))) +> - (format format-string (notmuch-tag-format-tags tags face))))))) +> + (format format-string (notmuch-tag-format-tags tags tags face))))))) +> +> (defun notmuch-tree-format-field-list (field-list msg) +> "Format fields of MSG according to FIELD-LIST and return string" +> diff --git a/emacs/notmuch.el b/emacs/notmuch.el +> index 0471750..1436e5a 100644 +> --- a/emacs/notmuch.el +> +++ b/emacs/notmuch.el +> @@ -754,7 +754,7 @@ non-authors is found, assume that all of the authors match." +> +> ((string-equal field "tags") +> (let ((tags (plist-get result :tags))) +> - (insert (format format-string (notmuch-tag-format-tags tags))))))) +> + (insert (format format-string (notmuch-tag-format-tags tags tags))))))) +> +> (defun notmuch-search-show-result (result &optional pos) +> "Insert RESULT at POS or the end of the buffer if POS is null." +> diff --git a/test/test-lib.el b/test/test-lib.el +> index 37fcb3d..6cbd57c 100644 +> --- a/test/test-lib.el +> +++ b/test/test-lib.el +> @@ -165,3 +165,7 @@ nothing." +> +> (t +> (notmuch-test-report-unexpected output expected))))) +> + +> +;; hide deleted tags + +Maybe "For historical reasons, we hide deleted tags by default in the +test suite"? + +> +(setq notmuch-tag-deleted-formats +> + '(("" nil))) +> -- +> 1.7.9.1 +> +> _______________________________________________ +> notmuch mailing list +> notmuch@notmuchmail.org +> http://notmuchmail.org/mailman/listinfo/notmuch -- 2.26.2