From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms5.migadu.com with LMTPS id AEdtGS5rv2I7MAEAbAwnHQ (envelope-from ) for ; Fri, 01 Jul 2022 23:46:22 +0200 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id wNY7GS5rv2JQRgEAauVa8A (envelope-from ) for ; Fri, 01 Jul 2022 23:46:22 +0200 Received: from mail.notmuchmail.org (yantan.tethera.net [135.181.149.255]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 1331E4175C for ; Fri, 1 Jul 2022 23:46:22 +0200 (CEST) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id BEDBC5F812; Fri, 1 Jul 2022 21:46:01 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [IPv6:2607:5300:60:c5::1]) by mail.notmuchmail.org (Postfix) with ESMTP id C87015F7CC for ; Fri, 1 Jul 2022 21:45:58 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 22D7A5FC0D; Fri, 1 Jul 2022 17:45:57 -0400 (EDT) Received: (nullmailer pid 462217 invoked by uid 1000); Fri, 01 Jul 2022 21:45:50 -0000 From: David Bremner To: notmuch@notmuchmail.org Subject: [PATCH 6/9] emacs/show: provide notmuch-show-choose-duplicate Date: Fri, 1 Jul 2022 18:45:45 -0300 Message-Id: <20220701214548.461943-7-david@tethera.net> X-Mailer: git-send-email 2.35.2 In-Reply-To: <20220701214548.461943-1-david@tethera.net> References: <20220701214548.461943-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: Y4CT27M457MALBXVLB2IXGTJODYKH4ZJ X-Message-ID-Hash: Y4CT27M457MALBXVLB2IXGTJODYKH4ZJ X-MailFrom: bremner@tethera.net X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-notmuch.notmuchmail.org-0; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.3 Precedence: list List-Id: "Use and development of the notmuch mail system." List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit X-Migadu-Flow: FLOW_IN X-Migadu-To: larch@yhetil.org X-Migadu-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1656711982; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:list-id:list-help: list-owner:list-unsubscribe:list-subscribe:list-post; bh=IeHFeMkIrqLufSlabmpFTF2+YK/Dw335Po97v2mTjTE=; b=NVW9V7zyCrC6fOSezCtehlQ58Wqdm4nAiXDAjkivQN4mPuYCRboim3v7I/9vHzWl9ohUbb Qf0Wa41XF1pIpBfaebglsb5yljl785H/owVBk+dwyKDA3lOaj5zRsoHPXXwvgthEZUBAq1 5Zg6wuIUUC98iHVCnOqCnwrVSdltDWIEmRtFpbLBewXa9grfppfJQfrXhMUyo2KUCtOsfz 8hhPrwmywKEOxM64YjVaf2g0QpXnb14G+vYrc2LZQ25jMz6WThIwEGfPj7yqDHGJckR02Z BMHp+sFNFzUXVEAeSZFg1H82/iPmCJwzbZlMbf2HtpBF74In3Dq8THxpJyiuXQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1656711982; a=rsa-sha256; cv=none; b=J4P8aRofq+A736o9cw4ccUeyPj873SNbWhPcGKIfg9pTSsj3DQiLWv0qtIQoLZyeVtgp8d ZUFsawB5xRLm34gz94rcQbPWZ610vCwrxLL6osN5fGs2lH7huK/51+E5ChqpA37QkUCpW2 3pkJ6bInZZSI0sqKudNhfQcEW8ixntrOWxtRjZfUk9pX+ifZcd2tyRzrvsYZTWj3KDt7/1 buCokYiLvmVqQ4AtDeHh0uD3ITRXZTweQ1LE0H+QdGBiNrwRjRMU0FO6fD5x3wNHmIvMT3 0lsaNHRvAw+QW5QthIBgRxSaWvioyuk12g9ZqWtcdewrVQkAp8emroNZF1uBbQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -1.26 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 135.181.149.255 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: 1331E4175C X-Spam-Score: -1.26 X-Migadu-Scanner: scn0.migadu.com X-TUID: JhoYIRiblyB6 This new command allows the user to interactively choose a different duplicate (file) to display for a given message in notmuch-show-mode. Since both tree and unthreaded view use notmuch-show-mode, this provides the same facility there. --- devel/emacs-keybindings.org | 1 + emacs/notmuch-lib.el | 4 +++- emacs/notmuch-show.el | 25 +++++++++++++++++++++++++ test/T450-emacs-show.sh | 29 +++++++++++++++++++++++++++++ test/T460-emacs-tree.sh | 14 ++++++++++++++ test/T465-emacs-unthreaded.sh | 15 +++++++++++++++ 6 files changed, 87 insertions(+), 1 deletion(-) diff --git a/devel/emacs-keybindings.org b/devel/emacs-keybindings.org index 00977bc3..ad7f72ef 100644 --- a/devel/emacs-keybindings.org +++ b/devel/emacs-keybindings.org @@ -40,6 +40,7 @@ | Z | notmuch-tree-from-search-current-query | notmuch-tree-from-show-current-query | | | =!= | | notmuch-show-toggle-elide-non-matching | | | =#= | | notmuch-show-print-message | | +| =%= | | notmuch-show-replace-msg | | | =$= | | notmuch-show-toggle-process-crypto | | | =*= | notmuch-search-tag-all | notmuch-show-tag-all | notmuch-tree-tag-thread | | + | notmuch-search-add-tag | notmuch-show-add-tag | notmuch-tree-add-tag | diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el index cc706924..84ba8c5e 100644 --- a/emacs/notmuch-lib.el +++ b/emacs/notmuch-lib.el @@ -1029,7 +1029,7 @@ status." (defvar-local notmuch-show-process-crypto nil) -(defun notmuch--run-show (search-terms) +(defun notmuch--run-show (search-terms &optional duplicate) "Return a list of threads of messages matching SEARCH-TERMS. A thread is a forest or list of trees. A tree is a two element @@ -1038,6 +1038,8 @@ is a possibly empty forest of replies." (let ((args '("show" "--format=sexp" "--format-version=5"))) (when notmuch-show-process-crypto (setq args (append args '("--decrypt=true")))) + (when duplicate + (setq args (append args (list (format "--duplicate=%d" duplicate))))) (setq args (append args search-terms)) (apply #'notmuch-call-notmuch-sexp args))) diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el index 53493785..020a7dca 100644 --- a/emacs/notmuch-show.el +++ b/emacs/notmuch-show.el @@ -1127,6 +1127,30 @@ is t, hide the part initially and show the button." (defvar notmuch-show-previous-subject "") (make-variable-buffer-local 'notmuch-show-previous-subject) +(defun notmuch-show-choose-duplicate (duplicate) + (interactive "Nduplicate: ") + (let ((count (length (notmuch-show-get-prop :filename)))) + (when (or (> duplicate count) + (< duplicate 1)) + (error "Duplicate %d out of range [1,%d]" duplicate count))) + (notmuch-show-move-to-message-top) + (save-excursion + (let* ((extent (notmuch-show-message-extent)) + (id (notmuch-show-get-message-id)) + (depth (notmuch-show-get-depth)) + (inhibit-read-only t) + (new-msg (notmuch--run-show (list id) duplicate))) + ;; clean up existing overlays to avoid extending them. + (dolist (o (overlays-in (car extent) (cdr extent))) + (delete-overlay o)) + ;; pretend insertion is happening at end of buffer + (narrow-to-region (point-min) (car extent)) + ;; Insert first, then delete, to avoid marker for start of next + ;; message being in same place as the start of this one. + (notmuch-show-insert-msg new-msg depth) + (widen) + (delete-region (point) (cdr extent))))) + (defun notmuch-show-insert-msg (msg depth) "Insert the message MSG at depth DEPTH in the current thread." (let* ((headers (plist-get msg :headers)) @@ -1583,6 +1607,7 @@ reset based on the original query." (define-key map "#" 'notmuch-show-print-message) (define-key map "!" 'notmuch-show-toggle-elide-non-matching) (define-key map "$" 'notmuch-show-toggle-process-crypto) + (define-key map "%" 'notmuch-show-choose-duplicate) (define-key map "<" 'notmuch-show-toggle-thread-indentation) (define-key map "t" 'toggle-truncate-lines) (define-key map "." 'notmuch-show-part-map) diff --git a/test/T450-emacs-show.sh b/test/T450-emacs-show.sh index 64f174cf..9cc90d91 100755 --- a/test/T450-emacs-show.sh +++ b/test/T450-emacs-show.sh @@ -338,4 +338,33 @@ when we detect the word "attachment" and there's no attach? :p EOF test_expect_equal_file EXPECTED OUTPUT +add_email_corpus duplicate + +ID3=87r2ecrr6x.fsf@zephyr.silentflame.com +test_begin_subtest "duplicate=3" +test_emacs "(notmuch-show \"id:${ID3}\") + (notmuch-show-choose-duplicate 3) + (test-visible-output \"OUTPUT\")" +output=$(grep "Subject:" OUTPUT) +file=$(notmuch search --output=files id:${ID3} | head -n 3 | tail -n 1) +subject=$(grep '^Subject:' $file) +test_expect_equal "$output" "$subject" + +test_begin_subtest "duplicate=0" +test_emacs "(test-log-error + (notmuch-show \"id:${ID3}\") + (notmuch-show-choose-duplicate 0))" +cat < EXPECTED +(error Duplicate 0 out of range [1,5]) +EOF +test_expect_equal_file EXPECTED MESSAGES + +test_begin_subtest "duplicate=1000" +test_emacs "(test-log-error + (notmuch-show \"id:${ID3}\") + (notmuch-show-choose-duplicate 1000))" +cat < EXPECTED +(error Duplicate 1000 out of range [1,5]) +EOF +test_expect_equal_file EXPECTED MESSAGES test_done diff --git a/test/T460-emacs-tree.sh b/test/T460-emacs-tree.sh index 0f23b418..bae26e3b 100755 --- a/test/T460-emacs-tree.sh +++ b/test/T460-emacs-tree.sh @@ -200,4 +200,18 @@ test_emacs '(test-log-error (notmuch-tree "*")))' test_expect_equal "$(cat MESSAGES)" "COMPLETE" +add_email_corpus duplicate + +ID3=87r2ecrr6x.fsf@zephyr.silentflame.com +test_begin_subtest "duplicate=3" +test_emacs "(notmuch-tree \"id:${ID3}\") + (notmuch-test-wait) + (notmuch-tree-show-message t) + (notmuch-show-choose-duplicate 3) + (test-visible-output \"OUTPUT\")" +output=$(grep "Subject:" OUTPUT) +file=$(notmuch search --output=files id:${ID3} | head -n 3 | tail -n 1) +subject=$(grep '^Subject:' $file) +test_expect_equal "$output" "$subject" + test_done diff --git a/test/T465-emacs-unthreaded.sh b/test/T465-emacs-unthreaded.sh index e7bc1439..9b96c7d7 100755 --- a/test/T465-emacs-unthreaded.sh +++ b/test/T465-emacs-unthreaded.sh @@ -57,4 +57,19 @@ test_emacs '(test-log-error (notmuch-unthreaded "*")))' test_expect_equal "$(cat MESSAGES)" "COMPLETE" +add_email_corpus duplicate + +ID3=87r2ecrr6x.fsf@zephyr.silentflame.com +test_begin_subtest "duplicate=3" +test_emacs "(let ((notmuch-tree-show-out t)) + (notmuch-unthreaded \"id:${ID3}\") + (notmuch-test-wait) + (notmuch-tree-show-message nil) + (notmuch-show-choose-duplicate 3) + (test-visible-output \"OUTPUT\"))" +output=$(grep "Subject:" OUTPUT) +file=$(notmuch search --output=files id:${ID3} | head -n 3 | tail -n 1) +subject=$(grep '^Subject:' $file) +test_expect_equal "$output" "$subject" + test_done -- 2.35.2