From b00496747565361d2dbe2e21e3e26558ed3fa4b1 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 1 Mar 2012 22:30:32 +0000 Subject: [PATCH] [Patch v7 00/13] Add NOTMUCH_MESSAGE_FLAG_EXCLUDED flag --- 1e/3fd9ab13c26f5e55b7400aa0a93d49a0503c38 | 120 ++++++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 1e/3fd9ab13c26f5e55b7400aa0a93d49a0503c38 diff --git a/1e/3fd9ab13c26f5e55b7400aa0a93d49a0503c38 b/1e/3fd9ab13c26f5e55b7400aa0a93d49a0503c38 new file mode 100644 index 000000000..0d4268cf2 --- /dev/null +++ b/1e/3fd9ab13c26f5e55b7400aa0a93d49a0503c38 @@ -0,0 +1,120 @@ +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 C5EB6431FAF + for ; Thu, 1 Mar 2012 14:29:06 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 2.7 +X-Spam-Level: ** +X-Spam-Status: No, score=2.7 tagged_above=-999 required=5 + tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, + FREEMAIL_ENVFROM_END_DIGIT=1, FREEMAIL_FROM=0.001, + FREEMAIL_REPLY=2.499, 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 Rywowe13aa5K for ; + Thu, 1 Mar 2012 14:29:06 -0800 (PST) +Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com + [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client + certificate requested) by olra.theworths.org (Postfix) with ESMTPS id + 00F86431FAE for ; Thu, 1 Mar 2012 14:29:05 -0800 + (PST) +Received: by wgbdt12 with SMTP id dt12so108365wgb.2 + for ; Thu, 01 Mar 2012 14:29:03 -0800 (PST) +Received-SPF: pass (google.com: domain of markwalters1009@gmail.com designates + 10.180.78.6 as permitted sender) client-ip=10.180.78.6; +Authentication-Results: mr.google.com; spf=pass (google.com: domain of + markwalters1009@gmail.com designates 10.180.78.6 as permitted + sender) smtp.mail=markwalters1009@gmail.com; + dkim=pass header.i=markwalters1009@gmail.com +Received: from mr.google.com ([10.180.78.6]) + by 10.180.78.6 with SMTP id x6mr6452193wiw.18.1330640943591 (num_hops = + 1); Thu, 01 Mar 2012 14:29:03 -0800 (PST) +DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; + h=from:to:cc:subject:date:message-id:x-mailer; + bh=adgorRMLJ0rLfgfKwbAWB/GTlcrrfsRfNEyU/P1Jckk=; + b=IB7ZLOgG8pHVJKPO+Ydbi8GtegfigMCWWr5O0rFEGGGZrxFmn0uhDQiw90UXN/iOix + Rrq6Nm8snlRxA6glSAcXMMrzwWbIYQrZC8mmapyRnRl0nAKCWoQ6oNwTctJAc9uXR36J + we0Y4uyvF9Jb+ckRrp83+ZeV5fm+5/97NJEBO6dp+2pk6IrpcM0cRtTnvScibfBTUmz4 + OXGtKVLQcV+sFawEIMIseszRVORA2PxHVJ3xfactqAH5bSYBnlSotvEcdEIAKHgR6E+U + ekuOjlejswDabeI2eoRrwfhpzBgPKoOhZ1ih9HpscNbIGnzjrFTl0Gn5SoYLcTlGoJIQ + W8rQ== +Received: by 10.180.78.6 with SMTP id x6mr5197446wiw.18.1330640943546; + Thu, 01 Mar 2012 14:29:03 -0800 (PST) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fw5sm44677830wib.0.2012.03.01.14.29.00 (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 01 Mar 2012 14:29:01 -0800 (PST) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [Patch v7 00/13] Add NOTMUCH_MESSAGE_FLAG_EXCLUDED flag +Date: Thu, 1 Mar 2012 22:30:32 +0000 +Message-Id: <1330641045-27416-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.2.3 +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: Thu, 01 Mar 2012 22:29:07 -0000 + +This is essentially the same as +id:"1330157204-26094-1-git-send-email-markwalters1009@gmail.com" but +has been rebased against master. The changes are to patch 12/13 for +notmuch-show.el (which was posted as a followup to the previous series) +and to the tests (patch 9/13) which changed in Austin's JSON show +rewrite. + +Best wishes + +Mark + +Mark Walters (13): + cli: add --no-exclude option to count and search. + cli: Add --no-exclude to the man pages for search and count + test: add tests for new cli --no-exclude option + lib: Rearrange the exclude code in query.cc + lib: Make notmuch_query_search_messages set the exclude flag + lib: Add the exclude flag to notmuch_query_search_threads + test: update search test to reflect exclude flag + cli: Make notmuch-show respect excludes. + test: update tests to reflect the exclude flag + man: update manpage for notmuch-show --no-exclude option + cli: omit excluded messages in results where appropriate. + emacs: show: recognize the exclude flag. + emacs: notmuch.el ignore excluded matches + + emacs/notmuch-show.el | 36 ++++++++++++++++----- + emacs/notmuch.el | 22 +++++++------ + lib/notmuch-private.h | 8 +++- + lib/notmuch.h | 16 +++++++-- + lib/query.cc | 77 +++++++++++++++++++++++++++++++++++++++------ + lib/thread.cc | 18 +++++++++-- + man/man1/notmuch-count.1 | 7 ++++ + man/man1/notmuch-search.1 | 7 ++++ + man/man1/notmuch-show.1 | 7 ++++ + notmuch-count.c | 19 +++++++--- + notmuch-search.c | 26 ++++++++++++--- + notmuch-show.c | 31 ++++++++++++++++-- + test/count | 21 ++++++++++++ + test/crypto | 9 +++++- + test/encoding | 2 +- + test/json | 6 ++-- + test/maildir-sync | 1 + + test/multipart | 6 ++-- + test/search | 8 ++++- + test/thread-naming | 16 +++++----- + 20 files changed, 273 insertions(+), 70 deletions(-) + +-- +1.7.2.3 + -- 2.26.2