From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from localhost (localhost [127.0.0.1]) by arlo.cworth.org (Postfix) with ESMTP id 3D7C36DE0217 for ; Wed, 21 Sep 2016 14:21:26 -0700 (PDT) X-Virus-Scanned: Debian amavisd-new at cworth.org X-Spam-Flag: NO X-Spam-Score: -0.007 X-Spam-Level: X-Spam-Status: No, score=-0.007 tagged_above=-999 required=5 tests=[AWL=0.004, SPF_PASS=-0.001, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from arlo.cworth.org ([127.0.0.1]) by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MRWHQU_OjioB for ; Wed, 21 Sep 2016 14:21:23 -0700 (PDT) Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197]) by arlo.cworth.org (Postfix) with ESMTPS id 718E26DE01F7 for ; Wed, 21 Sep 2016 14:21:23 -0700 (PDT) Received: from remotemail by fethera.tethera.net with local (Exim 4.84_2) (envelope-from ) id 1bmox3-0007vk-FD; Wed, 21 Sep 2016 17:21:09 -0400 Received: (nullmailer pid 29269 invoked by uid 1000); Wed, 21 Sep 2016 21:21:15 -0000 From: David Bremner To: Tomi Ollila , Daniel Kahn Gillmor , notmuch@notmuchmail.org Subject: Re: v3 of message properties patches In-Reply-To: References: <1470491559-3946-1-git-send-email-david@tethera.net> <87a8f2utfb.fsf@alice.fifthhorseman.net> <87lgylea1u.fsf@zancas.localnet> Date: Wed, 21 Sep 2016 18:21:15 -0300 Message-ID: <87intpdk50.fsf@zancas.localnet> MIME-Version: 1.0 Content-Type: text/plain X-BeenThere: notmuch@notmuchmail.org X-Mailman-Version: 2.1.22 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: Wed, 21 Sep 2016 21:21:26 -0000 Tomi Ollila writes: > > I am happy with merging the series, just amend the sepErates > (and possibly spcs->tab after $(dir)/string-map.c in -3-) > > I looked through the code and did not see anything that should broke > anything. As Daniel has been using it I can slack off from testing it myself :D > > Tomi I have merged this series, amended as follows: diff --git a/doc/man1/notmuch-dump.rst b/doc/man1/notmuch-dump.rst index 29964da..5857027 100644 --- a/doc/man1/notmuch-dump.rst +++ b/doc/man1/notmuch-dump.rst @@ -84,7 +84,7 @@ Supported options for **dump** include **properties** Output per-message (key,value) metadata. Each line starts - with "#= ", followed by a message id, and a space seperated + with "#= ", followed by a message id, and a space separated list of key=value pairs. pair. Ids, keys and values are hex encoded if needed. diff --git a/doc/man1/notmuch-restore.rst b/doc/man1/notmuch-restore.rst index ebdb3ff..c681fa2 100644 --- a/doc/man1/notmuch-restore.rst +++ b/doc/man1/notmuch-restore.rst @@ -63,7 +63,7 @@ Supported options for **restore** include **properties** Output per-message (key,value) metadata. Each line starts - with "#= ", followed by a message id, and a space seperated + with "#= ", followed by a message id, and a space separated list of key=value pairs. pair. Ids, keys and values are hex encoded if needed. diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst index a85d94b..de93d73 100644 --- a/doc/man7/notmuch-search-terms.rst +++ b/doc/man7/notmuch-search-terms.rst @@ -58,7 +58,7 @@ indicate user-supplied values): - query: -- has:= +- property:= The **from:** prefix is used to match the name or address of the sender of an email message. @@ -141,7 +141,7 @@ queries added with **notmuch-config(1)**. Named queries are only available if notmuch is built with **Xapian Field Processors** (see below). -The **has:** prefix searches for messages with a particular +The **property:** prefix searches for messages with a particular = property pair. Properties are used internally by notmuch (and extensions) to add metadata to messages. A given key can be present on a given message with several different values. @@ -224,7 +224,7 @@ exact matches like "tag:inbox" or **probabilistic**, supporting a more flexible Boolean - **tag:**, **id:**, **thread:**, **folder:**, **path:**, **has:** + **tag:**, **id:**, **thread:**, **folder:**, **path:**, **property:** Probabilistic **from:**, **to:**, **subject:**, **attachment:**, **mimetype:** diff --git a/lib/Makefile.local b/lib/Makefile.local index c012ed1..3d1030a 100644 --- a/lib/Makefile.local +++ b/lib/Makefile.local @@ -40,7 +40,7 @@ libnotmuch_c_srcs = \ $(dir)/messages.c \ $(dir)/sha1.c \ $(dir)/built-with.c \ - $(dir)/string-map.c \ + $(dir)/string-map.c \ $(dir)/tags.c libnotmuch_cxx_srcs = \ diff --git a/lib/database.cc b/lib/database.cc index d3e2e0e..392e8b2 100644 --- a/lib/database.cc +++ b/lib/database.cc @@ -97,7 +97,7 @@ typedef struct { * STRING is the name of a file within that * directory for this mail message. * - * has: Has a property with key=value + * property: Has a property with key=value * FIXME: if no = is present, should match on any value * * A mail document also has four values: @@ -254,7 +254,6 @@ static prefix_t BOOLEAN_PREFIX_INTERNAL[] = { { "directory", "XDIRECTORY" }, { "file-direntry", "XFDIRENTRY" }, { "directory-direntry", "XDDIRENTRY" }, - { "property", "XPROPERTY" }, }; static prefix_t BOOLEAN_PREFIX_EXTERNAL[] = { @@ -263,7 +262,7 @@ static prefix_t BOOLEAN_PREFIX_EXTERNAL[] = { { "is", "K" }, { "id", "Q" }, { "path", "P" }, - { "has", "XPROPERTY" }, + { "property", "XPROPERTY" }, /* * Unconditionally add ':' to reduce potential ambiguity with * overlapping prefixes and/or terms that start with capital diff --git a/test/T610-message-property.sh b/test/T610-message-property.sh index ee7910b..65ff19d 100755 --- a/test/T610-message-property.sh +++ b/test/T610-message-property.sh @@ -237,12 +237,12 @@ notmuch restore < BEFORE2 notmuch dump | grep '^#=' > OUTPUT test_expect_equal_file PROPERTIES OUTPUT -test_begin_subtest "test 'has:' queries: empty" -notmuch search has:testkey1=charles > OUTPUT +test_begin_subtest "test 'property:' queries: empty" +notmuch search property:testkey1=charles > OUTPUT test_expect_equal_file /dev/null OUTPUT -test_begin_subtest "test 'has:' queries: single message" -notmuch search --output=messages has:testkey1=alice > OUTPUT +test_begin_subtest "test 'property:' queries: single message" +notmuch search --output=messages property:testkey1=alice > OUTPUT cat <EXPECTED id:4EFC743A.3060609@april.org EOF