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 7B5A4431FB6 for ; Fri, 6 Apr 2012 05:49:15 -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 fjM-FjFTo73j for ; Fri, 6 Apr 2012 05:49:14 -0700 (PDT) Received: from mail-wi0-f173.google.com (mail-wi0-f173.google.com [209.85.212.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client certificate requested) by olra.theworths.org (Postfix) with ESMTPS id B0022431FAE for ; Fri, 6 Apr 2012 05:49:14 -0700 (PDT) Received: by wibhq7 with SMTP id hq7so422288wib.2 for ; Fri, 06 Apr 2012 05:49:12 -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=dc4Rj5I+rRaUqq6ExiG2nzRucVN+ejPEmMv9mJT1sf8=; b=xrWQJWfMN/bdnEYULHkz0CYIqky8Ggnq10pANyrA9AkF6K3CNvuzAYgsVP/tNGJMvB KwuqBJagUSIOoskpI4ozw0PIAKv4rCsfBCAu/VB7IJa6VwOv8MmSENevBat8Zkp68VsY HWUx0K6yd2e/vCH1SOh1wRk+soiqqUDh2GQnRMl15HFaRRv9TExiJhR+531mpddYpIki LGO6zJfYIjKamC5AmmiqoqU+iYkZnD6xzkcfSMaRpHFqXFraLHmxwfUGL5i5nyGhG4jC lrf2sjIRz8WlCM8R83MZ6kNzZu2AU9U03HzJnNxNDCCvgAOdvmnYOYWXTc0WM6fuxqG3 lIwA== Received: by 10.216.132.202 with SMTP id o52mr3837104wei.106.1333716551930; Fri, 06 Apr 2012 05:49:11 -0700 (PDT) Received: from localhost (94-192-233-223.zone6.bethere.co.uk. [94.192.233.223]) by mx.google.com with ESMTPS id ex2sm10150011wib.8.2012.04.06.05.49.08 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 06 Apr 2012 05:49:10 -0700 (PDT) From: Mark Walters To: notmuch@notmuchmail.org Subject: [PATCH v3 0/6] Move --no-exclude to --exclude=(true|false|flag) Date: Fri, 6 Apr 2012 13:49:05 +0100 Message-Id: <1333716551-29153-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: Fri, 06 Apr 2012 12:49:15 -0000 This is the latest version of the patch series (previous version at [1]). I think this version fixes all the problems raised by Austin in his review. In particular it rephrases the documentation comment for notmuch_query_set_omit_excluded_messages in notmuch.h, and renames the function to notmuch_query_set_omit_excluded. Corrects the comments and the warning message in notmuch-search.c Modifies the generate_thread function in the search-excludes test. This function now sets gen_thread_id to the id of the generated threads and populates an array gen_thread_msg_id with the message ids of the the messages in the threads. It also slightly changes the subjects to "subject: top message" and "subject: reply n" where n is the depth in the thread. The last of these should be checked as I am not very familiar with bash quoting so could easily have omitted needed quotes. Best wishes Mark [1] id:"1333234442-28616-1-git-send-email-markwalters1009@gmail.com" Mark Walters (6): 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. test: add some exclude tests cli: move show to the new --exclude= option naming scheme. emacs: make show set --exclude=false emacs/notmuch-show.el | 6 +- lib/notmuch.h | 23 ++++- 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 | 50 +++++++---- test/count | 4 +- test/notmuch-test | 1 + test/search | 48 ---------- test/search-excludes | 219 +++++++++++++++++++++++++++++++++++++++++++++ 14 files changed, 342 insertions(+), 102 deletions(-) create mode 100755 test/search-excludes -- 1.7.9.1