From 025d94e9ec63aaee17b6f0a8899b2e91b1e076e0 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 15 Mar 2012 18:42:00 +0000 Subject: [PATCH] [PATCH 0/5] Move --no-exclude to --exclude=(true|false|flag) --- 7b/1be2ab4215dffb47dfce606532a17bac1cda7f | 111 ++++++++++++++++++++++ 1 file changed, 111 insertions(+) create mode 100644 7b/1be2ab4215dffb47dfce606532a17bac1cda7f diff --git a/7b/1be2ab4215dffb47dfce606532a17bac1cda7f b/7b/1be2ab4215dffb47dfce606532a17bac1cda7f new file mode 100644 index 000000000..63a3d6ab2 --- /dev/null +++ b/7b/1be2ab4215dffb47dfce606532a17bac1cda7f @@ -0,0 +1,111 @@ +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 522F4431FB6 + for ; Thu, 15 Mar 2012 11:42:11 -0700 (PDT) +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 4+WskcPbZRLs for ; + Thu, 15 Mar 2012 11:42:10 -0700 (PDT) +Received: from mail-we0-f181.google.com (mail-we0-f181.google.com + [74.125.82.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 97F62431FAE + for ; Thu, 15 Mar 2012 11:42:10 -0700 (PDT) +Received: by werm13 with SMTP id m13so3528469wer.26 + for ; Thu, 15 Mar 2012 11:42:09 -0700 (PDT) +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=nq4KjqC/VpNEL4SsZfUDNb7FY6BcAltkUaiBlMsEw40=; + b=c5yGuc1+yHV3/BJ8tz9tWHqDgKK028Gi6Z0QjdGpD4xaucFkxLEJDXmVG92X7UhUzM + 8/dYMD1Oi1ekqWrnowRk7py+QxKR9JqIKEbgPUTYyuOchshUVM8g8aRT7vFTZJwQRHU/ + hUCWL6gLENZaQ60bahGKsI1AWk6oY1kYgBTqblcwF4brS2e0ZD4bauqw3+Pn7FMrZ36W + CregJBQNHXCBQv0cv6z5ICYde9epFWIvRqNIkR9DhCvuA78c3InwyNDuwf8mfIK89jGB + ECNRKQMaOhTJxrlQlLYbS0SOyH8mgGQOBZl1vH8V2RkuDfvDpyaRg/LBHt1vWCpfRaxS + dMiQ== +Received: by 10.216.131.98 with SMTP id l76mr4587794wei.62.1331836929243; + Thu, 15 Mar 2012 11:42:09 -0700 (PDT) +Received: from localhost (94-192-233-223.zone6.bethere.co.uk. + [94.192.233.223]) by mx.google.com with ESMTPS id + fi4sm7056842wib.4.2012.03.15.11.42.07 (version=TLSv1/SSLv3 cipher=OTHER); + Thu, 15 Mar 2012 11:42:08 -0700 (PDT) +From: Mark Walters +To: notmuch@notmuchmail.org +Subject: [PATCH 0/5] Move --no-exclude to --exclude=(true|false|flag) +Date: Thu, 15 Mar 2012 18:42:00 +0000 +Message-Id: <1331836925-31437-1-git-send-email-markwalters1009@gmail.com> +X-Mailer: git-send-email 1.7.9.1 +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, 15 Mar 2012 18:42:11 -0000 + +This series changes the --no-exclude options to count, search and show +to --exclude=(true|false|flag). It also changes the default to true +rather than flag for speed and for uncluttered command line output. + +This series replaces the series +id:"1330779918-28024-1-git-send-email-markwalters1009@gmail.com". Jani +suggested the --exclude= rather than --with-excluded approach as being +both clearer and easier to extend. + +It is intend to apply on top of the bugfix series +id:"1331728014-32698-1-git-send-email-markwalters1009@gmail.com". + +There should be no significant logic change (i.e. the logic in the lib +is unchanged) but the defaults for the command lines are different. + +The general idea is that when complete threads are requested then we +always return complete threads including any messages matching the +exclude tags (where appropriate these are flagged excluded), but we +may not return threads that only match in excluded messages. + +The rationale is that it is awkward to deal with a thread with +"missing" messages. + +Best wishes + +Mark + +Mark Walters (5): + lib: change default for notmuch_query_set_omit_excluded + cli: move count to the new --exclude=(true|false|flag) naming scheme. + cli: move search to the new --exclude= naming scheme. + cli: move show to the new --exclude= option naming scheme. + emacs: make show set --exclude=flag + + emacs/notmuch-show.el | 6 ++++-- + lib/notmuch.h | 11 ++++++----- + lib/query.cc | 10 +++++----- + man/man1/notmuch-count.1 | 5 +++-- + man/man1/notmuch-search.1 | 12 +++++++++--- + man/man1/notmuch-show.1 | 16 ++++++++++++++-- + notmuch-client.h | 1 + + notmuch-count.c | 17 ++++++++++++----- + notmuch-search.c | 32 +++++++++++++++++++++++--------- + notmuch-show.c | 39 +++++++++++++++++++++++++++++---------- + test/count | 4 ++-- + test/search | 13 ++++++------- + 12 files changed, 114 insertions(+), 52 deletions(-) + +-- +1.7.9.1 + -- 2.26.2