From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp10.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id cBgsCqJC7GG/UAEAgWs5BA (envelope-from ) for ; Sat, 22 Jan 2022 18:45:06 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp10.migadu.com with LMTPS id 2CP3AqJC7GF7aQAAG6o9tA (envelope-from ) for ; Sat, 22 Jan 2022 18:45:06 +0100 Received: from mail.notmuchmail.org (yantan.tethera.net [IPv6:2a01:4f9:c011:7a79::1]) (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 C078C2CEDD for ; Sat, 22 Jan 2022 18:45:05 +0100 (CET) Received: from yantan.tethera.net (localhost [127.0.0.1]) by mail.notmuchmail.org (Postfix) with ESMTP id 650A75F71D; Sat, 22 Jan 2022 17:44:53 +0000 (UTC) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by mail.notmuchmail.org (Postfix) with ESMTP id 0C6AE5F713 for ; Sat, 22 Jan 2022 17:44:50 +0000 (UTC) Received: by fethera.tethera.net (Postfix, from userid 1001) id 59E975FC75; Sat, 22 Jan 2022 12:44:49 -0500 (EST) Received: (nullmailer pid 1573326 invoked by uid 1000); Sat, 22 Jan 2022 17:44:46 -0000 From: David Bremner To: David Bremner , Gregor Zattler , notmuch@notmuchmail.org Subject: [PATCH 1/2] Revert "emacs: use --exclude=false when checking for empty searches" Date: Sat, 22 Jan 2022 13:44:39 -0400 Message-Id: <20220122174440.1573257-2-david@tethera.net> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220122174440.1573257-1-david@tethera.net> References: <878rv74wto.fsf@tethera.net> <20220122174440.1573257-1-david@tethera.net> MIME-Version: 1.0 Message-ID-Hash: 677IYIMK63MOPJFOOISIRQJ6PYLDTPFK X-Message-ID-Hash: 677IYIMK63MOPJFOOISIRQJ6PYLDTPFK 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-Country: DE ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1642873505; 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=LR/Ynx1Mqs6PGLBW+d4WGJh6z5zm5mB3hRdh8LDcnbI=; b=cJ8uS0avlnD9M0g36UbA/ZsCQEB9u1pbqj/zNXRrGPORyCDaOSIeC4ejegvZxrsXh7YTAs DRF6/nHX7RJmKr4SFqhK/OWdd5bkWDYa3AlJNRdeoGpISVF1x2Wsy0uIWYPqBlBwU/a2VT NhNvRQn3IWZzwss4LQmNdaQRX87+UZtf7qgAtwLElNnc1Ql3qODO5xQPL8ON401p1fo3Ix 7Or1mkbsvf7ZzE5EFViWTGwiaJ3Qb/jF/A73iJlL24ue0/jkIXLo2TPOWlJCrHQTJYloxx OoiV4UntfU7BcoaIMyrsVpyN0JTN8ii98qfxqIOSd61DAM8vUpWd1Eg4Trpr2g== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1642873505; a=rsa-sha256; cv=none; b=hA8ahoOuLJPR+tqvzl4tRUg2tYcmT5djM7N9BmcEdc1+KeDvKfCqA2owxkaF3gzIkG4Xm6 p+UtCVDmH0VGo1Rffyax3kiStQqUkzD9+IcqjsrPsBql/7dLJYKe8T9ArvLtw9I0UWg+hv QjqGn/G3H0pqluwrv4iszXF0NGaeHVaWVZ3yDDKq+Gru+ZeRkAjCnvh0Y0Bia23pUzjE9w /M2djkrHqOotisrNilUXu2SBkyrnQToEV972gBIIep6zVMAkf73LiU7mysxfHXb0KzhvHX DxJcV1ZlIXjq98eRa1EVs+iqIJsY00A5KzsroANbxQR8qcZWflsl/KzEBKVQTw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Spam-Score: -2.32 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of notmuch-bounces@notmuchmail.org designates 2a01:4f9:c011:7a79::1 as permitted sender) smtp.mailfrom=notmuch-bounces@notmuchmail.org X-Migadu-Queue-Id: C078C2CEDD X-Spam-Score: -2.32 X-Migadu-Scanner: scn0.migadu.com X-TUID: a9IUb9oMm2tM Revert commit 8370e3cfe2dd8a79323613c2bbf2f11db6134dac, and remark the corresponding test as broken. Also update the expected output of the broken test to show excludes active in the user defined saved searches. --- emacs/notmuch-hello.el | 2 +- test/T440-emacs-hello.sh | 1 + test/emacs.expected-output/notmuch-hello-all-tags | 4 ---- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/emacs/notmuch-hello.el b/emacs/notmuch-hello.el index 9ac52c11..71e91093 100644 --- a/emacs/notmuch-hello.el +++ b/emacs/notmuch-hello.el @@ -570,7 +570,7 @@ options will be handled as specified for (plist-get options :filter)))) "\n"))) (unless (= (notmuch--call-process-region (point-min) (point-max) notmuch-command - t t nil "count" "--exclude=false" "--batch") 0) + t t nil "count" "--batch") 0) (notmuch-logged-error "notmuch count --batch failed" "Please check that the notmuch CLI is new enough to support `count diff --git a/test/T440-emacs-hello.sh b/test/T440-emacs-hello.sh index 842781a4..dc80cc75 100755 --- a/test/T440-emacs-hello.sh +++ b/test/T440-emacs-hello.sh @@ -69,6 +69,7 @@ notmuch tag -$tag '*' test_expect_equal_file $EXPECTED/notmuch-hello-long-names OUTPUT test_begin_subtest "All tags show up" +test_subtest_known_broken tag=exclude_me notmuch tag +$tag '*' notmuch config set search.exclude_tags $tag diff --git a/test/emacs.expected-output/notmuch-hello-all-tags b/test/emacs.expected-output/notmuch-hello-all-tags index 2802a708..65e479fa 100644 --- a/test/emacs.expected-output/notmuch-hello-all-tags +++ b/test/emacs.expected-output/notmuch-hello-all-tags @@ -1,9 +1,5 @@ Welcome to notmuch. You have 52 messages. -Saved searches: [edit] - - 52 inbox 52 unread 52 all mail - Search: . All tags: [hide] -- 2.34.1