From 0f8148e920810349df207414e40b9489dc246c37 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sat, 14 Jan 2012 16:46:16 +0200 Subject: cli: add support for replying just to the sender in "notmuch reply" Add new option --reply-to=(all|sender) to "notmuch reply" to select whether to reply to all (sender and all recipients), or just sender. Reply to all remains the default. Credits to Mark Walters for his similar earlier work where I picked up the basic idea of handling reply-to-sender in add_recipients_from_message(). All bugs are mine, though. Signed-off-by: Jani Nikula --- man/man1/notmuch-reply.1 | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index db464d8..5160ece 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -14,11 +14,13 @@ Constructs a reply template for a set of messages. To make replying to email easier, .B notmuch reply takes an existing set of messages and constructs a suitable mail -template. The Reply-to header (if any, otherwise From:) is used for -the To: address. Vales from the To: and Cc: headers are copied, but -not including any of the current user's email addresses (as configured -in primary_mail or other_email in the .notmuch\-config file) in the -recipient list +template. The Reply-to: header (if any, otherwise From:) is used for +the To: address. Unless +.BR \-\-reply-to=sender +is specified, values from the To: and Cc: headers are copied, but not +including any of the current user's email addresses (as configured in +primary_mail or other_email in the .notmuch\-config file) in the +recipient list. It also builds a suitable new subject, including Re: at the front (if not already present), and adding the message IDs of the messages being @@ -45,6 +47,22 @@ Includes subject and quoted message body. Only produces In\-Reply\-To, References, To, Cc, and Bcc headers. .RE .RE +.RS +.TP 4 +.BR \-\-reply\-to= ( all | sender ) +.RS +.TP 4 +.BR all " (default)" +Replies to all addresses. +.TP 4 +.BR sender +Replies only to the sender. If replying to user's own message +(Reply-to: or From: header is one of the user's configured email +addresses), try To:, Cc:, and Bcc: headers in this order, and copy +values from the first that contains something other than only the +user's addresses. +.RE +.RE See \fBnotmuch-search-terms\fR(7) for details of the supported syntax for . -- cgit v1.2.3 From 8ea82928b91e847298e4586f9db9734e727a418a Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Tue, 17 Jan 2012 20:16:03 +0200 Subject: fix .gitignore for gzipped man pages --- .gitignore | 1 - man/.gitignore | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 man/.gitignore (limited to 'man') diff --git a/.gitignore b/.gitignore index d64ec9f..d428290 100644 --- a/.gitignore +++ b/.gitignore @@ -7,7 +7,6 @@ tags /notmuch notmuch.sym notmuch-shared -notmuch.1.gz libnotmuch.so* libnotmuch*.dylib *.[ao] diff --git a/man/.gitignore b/man/.gitignore new file mode 100644 index 0000000..26ead20 --- /dev/null +++ b/man/.gitignore @@ -0,0 +1,2 @@ +# ignore gzipped man pages +*.[0-9].gz -- cgit v1.2.3 From bb8ab4c830aa77f7c80a45b2602a081097afba6b Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 26 Feb 2012 00:23:41 +0200 Subject: man: document the notmuch configuration settings in notmuch-config(1) At the risk of duplication between the man page and the configuration file generated by default, document the notmuch configuration options in the notmuch config man page. Existing users of notmuch should not be expected to re-generate their config file in order to get access to the documentation for new configuration options. Include some minor fixes and cleanups while at it. --- man/man1/notmuch-config.1 | 125 +++++++++++++++++++++++++++++++++++++++------- 1 file changed, 108 insertions(+), 17 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index cb3234f..0260eb7 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-CONFIG 1 2011-12-04 "Notmuch 0.10.2" .SH NAME -notmuch-config \- Output a single part of a multipart MIME message. +notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS .B notmuch config get @@ -16,34 +16,125 @@ The command can be used to get or set settings in the notmuch configuration file. -.SS GET - +.RS 4 +.TP 4 +.B get The value of the specified configuration item is printed to stdout. If -the item has multiple values, each value is separated by a newline -character. +the item has multiple values (it is a list), each value is separated +by a newline character. +.RE -Available configuration items include at least +.RS 4 +.TP 4 +.B set +The specified configuration item is set to the given value. To specify +a multiple-value item (a list), provide each value as a separate +command-line argument. - database.path +If no values are provided, the specified configuration item will be +removed from the configuration file. +.RE - user.name +The available configuration items are described below. - user.primary_email +.RS 4 +.TP 4 +.B database.path +The top-level directory where your mail currently exists and to where +mail will be delivered in the future. Files should be individual email +messages. Notmuch will store its database within a sub-directory of +the path configured here named +.BR ".notmuch". +.RE - user.other_email +.RS 4 +.TP 4 +.B user.name +Your full name. +.RE - new.tags +.RS 4 +.TP 4 +.B user.primary_email +Your primary email address. +.RE -.SS SET +.RS 4 +.TP 4 +.B user.other_email +A list of other email addresses at which you receive email. +.RE -The specified configuration item is set to the given value. To -specify a multiple-value item, provide each value as a separate -command-line argument. +.RS 4 +.TP 4 +.B new.tags +A list of tags that will be added to all messages incorporated by +.BR "notmuch new". +.RE -If no values are provided, the specified configuration item will be -removed from the configuration file. +.RS 4 +.TP 4 +.B new.ignore +A list of file and directory names, without path, that will not be +searched for messages by +.BR "notmuch new". +All the files and directories matching any of the names specified here +will be ignored, regardless of the location in the mail store +directory hierarchy. .RE +.RS 4 +.TP 4 +.B search.exclude +A list of tags that will be excluded from search results by +default. Using an excluded tag in a query will override that +exclusion. +.RE + +.RS 4 +.TP 4 +.B maildir.synchronize_flags +If true, then the following maildir flags (in message filenames) will +be synchronized with the corresponding notmuch tags: + + Flag Tag + ---- ------- + D draft + F flagged + P passed + R replied + S unread (added when 'S' flag is not present) + +The +.B notmuch new +command will notice flag changes in filenames and update tags, while +the +.B notmuch tag +and +.B notmuch restore +commands will notice tag changes and update flags in filenames. + +If there have been any changes in the maildir (new messages added, old +ones removed or renamed, maildir flags changed, etc.), it is advisable +to run +.B notmuch new +before +.B notmuch tag +or +.B notmuch restore +commands to ensure the tag changes are properly synchronized to the +maildir flags, as the commands expect the database and maildir to be +in sync. +.RE + +.RE +.SH ENVIRONMENT +The following environment variables can be used to control the +behavior of notmuch. +.TP +.B NOTMUCH_CONFIG +Specifies the location of the notmuch configuration file. Notmuch will +use ${HOME}/.notmuch\-config if this variable is not set. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-count\fR(1), -- cgit v1.2.3 From bf28c60b9facb898d52759c2be993acac67c26d2 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 26 Feb 2012 00:57:23 +0200 Subject: man: add references to maildir flag synchronization notmuch new, restore, and tag commands support maildir flag synchronization with notmuch tags. Reference the notmuch-config(1) man page about it in the relevant man pages. --- man/man1/notmuch-new.1 | 5 +++++ man/man1/notmuch-restore.1 | 6 ++++++ man/man1/notmuch-tag.1 | 6 ++++++ 3 files changed, 17 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 77d4776..76910a4 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -40,6 +40,11 @@ has previously been completed, but .B "notmuch new" has not previously been run. +.B "notmuch new" +updates tags according to maildir flag changes if the +.B "maildir.synchronize_flags" +configuration option is enabled. See \fBnotmuch-config\fR(1) for +details. The .B new diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 2191df0..ef27938 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -29,6 +29,12 @@ dump file. See \fBnotmuch-search-terms\fR(7) for details of the supported syntax for . +.B "notmuch restore" +updates the maildir flags according to tag changes if the +.B "maildir.synchronize_flags" +configuration option is enabled. See \fBnotmuch-config\fR(1) for +details. + .RE .SH SEE ALSO diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 993911b..7281bb2 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -23,6 +23,12 @@ an initial search term beginning with '+' or '\-' is provided by allowing the user to specify a "\-\-" argument to separate the tags from the search terms. +.B "notmuch tag" +updates the maildir flags according to tag changes if the +.B "maildir.synchronize_flags" +configuration option is enabled. See \fBnotmuch-config\fR(1) for +details. + .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -- cgit v1.2.3 From 13235d35356dd065855d4db4d44da274808407a1 Mon Sep 17 00:00:00 2001 From: Pieter Praet Date: Tue, 28 Feb 2012 19:42:03 +0100 Subject: doc: minor corrections in notmuch-config.1 * man/man1/notmuch-config.1 - SYNOPSIS: Remove spaces in 'section.item' arg, and indicate that `notmuch config set' accepts multiple value args. - DESCRIPTION: Correct config option to exclude tags from search results. ('search.exclude_tags' instead of 'search.exclude') Also see commit bb8ab4c8. --- man/man1/notmuch-config.1 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 0260eb7..3d69cc6 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -4,10 +4,10 @@ notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS .B notmuch config get -.RI "<" section "> . <" item ">" +.RI "<" section ">.<" item ">" .B notmuch config set -.RI "<" section "> . <" item "> [" value "]" +.RI "<" section ">.<" item "> [" value " ...]" .SH DESCRIPTION @@ -85,7 +85,7 @@ directory hierarchy. .RS 4 .TP 4 -.B search.exclude +.B search.exclude_tags A list of tags that will be excluded from search results by default. Using an excluded tag in a query will override that exclusion. -- cgit v1.2.3 From 916aefc2de504a3f658145352c690c170504c8c1 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Thu, 1 Mar 2012 07:47:21 -0400 Subject: bump version to 0.12~rc1 As usual, only `version' is edited by hand. The rest of the changes I blame on the machine. --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index ed40e7f..e58a1b5 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.11.1' +__VERSION__ = '0.12~rc1' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 3d69cc6..e62577c 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-CONFIG 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 25fe329..0d0ab5d 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-COUNT 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 9ccf35d..bd7e274 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-DUMP 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 76910a4..ccee738 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-NEW 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 5160ece..7ed7f0f 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-REPLY 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index ef27938..8bd59e4 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-RESTORE 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 0bc3f40..19d85df 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-SEARCH 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index b2301d8..4c5db94 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-SHOW 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 7281bb2..8e0bb5c 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-TAG 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 424ca36..3ab1af5 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH 1 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 2c4e552..1e459c0 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-HOOKS 5 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index a53565b..09a699f 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2011-12-04 "Notmuch 0.10.2" +.TH NOTMUCH-SEARCH-TERMS 7 2012-02-29 "Notmuch 0.12~rc1" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index af88ba8..0d4c53f 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.11.1 +0.12~rc1 -- cgit v1.2.3 From 4eab10f0f82cbae8635552a05a7d0ee4ca1ef8cc Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 1 Mar 2012 22:30:34 +0000 Subject: cli: Add --no-exclude to the man pages for search and count --- man/man1/notmuch-count.1 | 7 +++++++ man/man1/notmuch-search.1 | 7 +++++++ 2 files changed, 14 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 0d0ab5d..805a8ae 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -38,6 +38,13 @@ Output the number of matching messages. This is the default. Output the number of matching threads. .RE .RE + +.RS 4 +.TP 4 +.BR \-\-no\-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE .RE .RE diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 19d85df..8426aa3 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -112,6 +112,13 @@ result from the end. Limit the number of displayed results to N. .RE +.RS 4 +.TP 4 +.BR \-\-no\-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE + .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -- cgit v1.2.3 From 99c318cae464159ca5b4ec86643ccf3c8b98c1b3 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Thu, 1 Mar 2012 22:30:42 +0000 Subject: man: update manpage for notmuch-show --no-exclude option --- man/man1/notmuch-show.1 | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 4c5db94..d75d971 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -128,6 +128,13 @@ multipart/encrypted part will be replaced by the decrypted content. .RE +.RS 4 +.TP 4 +.B \-\-no-exclude + +Do not exclude the messages matching search.exclude_tags in the config file. +.RE + A common use of .B notmuch show is to display a single thread of email messages. For this, use a -- cgit v1.2.3 From dfee0f97b92d6ca389ff81f0d1659496bb9d74f5 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Wed, 29 Feb 2012 18:13:07 +0000 Subject: man: remove search.exclude_tags from notmuch-config.1 for 0.12 --- man/man1/notmuch-config.1 | 8 -------- 1 file changed, 8 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index e62577c..57eee93 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -83,14 +83,6 @@ will be ignored, regardless of the location in the mail store directory hierarchy. .RE -.RS 4 -.TP 4 -.B search.exclude_tags -A list of tags that will be excluded from search results by -default. Using an excluded tag in a query will override that -exclusion. -.RE - .RS 4 .TP 4 .B maildir.synchronize_flags -- cgit v1.2.3 From 4b3af0e4443f88f302f09a7a6099a31103d862d6 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 3 Mar 2012 08:56:15 -0400 Subject: Make exclusion visible again This reverts dfee0f9 man: remove search.exclude_tags from notmuch-config.1 for 0.12 e83409d NEWS: revert NEWS item for exclude tags for 0.12 e77b031 config: disable addition of exclude tags for 0.12 --- NEWS | 18 ++++++++++++++++++ man/man1/notmuch-config.1 | 8 ++++++++ notmuch-config.c | 3 ++- notmuch-setup.c | 19 ++++++++++++++++++- 4 files changed, 46 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/NEWS b/NEWS index 4152e7c..a739914 100644 --- a/NEWS +++ b/NEWS @@ -11,6 +11,24 @@ Reply to sender to all. The feature is available through the new command line option --reply-to=(all|sender). +Tag exclusion + + Tags can be automatically excluded from search results by adding them + to the new 'search.exclude_tags' option in the Notmuch config file. + + This behaviour can be overridden by explicitly including an excluded + tag in your query, for example: + + notmuch search $your_query and tag:$excluded_tag + + Existing users will probably want to run "notmuch setup" again to add + the new well-commented [search] section to the configuration file. + + For new configurations, accepting the default setting will cause the + tags "deleted" and "spam" to be excluded, equivalent to running: + + notmuch config set search.exclude_tags deleted spam + Mail store folder/file ignore A new configuration option, `new.ignore`, lets users specify a diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 57eee93..e62577c 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -83,6 +83,14 @@ will be ignored, regardless of the location in the mail store directory hierarchy. .RE +.RS 4 +.TP 4 +.B search.exclude_tags +A list of tags that will be excluded from search results by +default. Using an excluded tag in a query will override that +exclusion. +.RE + .RS 4 .TP 4 .B maildir.synchronize_flags diff --git a/notmuch-config.c b/notmuch-config.c index 61fda3e..e9b2750 100644 --- a/notmuch-config.c +++ b/notmuch-config.c @@ -377,7 +377,8 @@ notmuch_config_open (void *ctx, if (notmuch_config_get_search_exclude_tags (config, &tmp) == NULL) { if (is_new) { - /* We do not set default search_exclude_tags for 0.12 */ + const char *tags[] = { "deleted", "spam" }; + notmuch_config_set_search_exclude_tags (config, tags, 2); } else { notmuch_config_set_search_exclude_tags (config, NULL, 0); } diff --git a/notmuch-setup.c b/notmuch-setup.c index 307231d..94d0aa7 100644 --- a/notmuch-setup.c +++ b/notmuch-setup.c @@ -133,6 +133,8 @@ notmuch_setup_command (unused (void *ctx), int is_new; const char **new_tags; size_t new_tags_len; + const char **search_exclude_tags; + size_t search_exclude_tags_len; #define prompt(format, ...) \ do { \ @@ -209,7 +211,22 @@ notmuch_setup_command (unused (void *ctx), } - /* Temporarily remove exclude tag support for 0.12 */ + search_exclude_tags = notmuch_config_get_search_exclude_tags (config, &search_exclude_tags_len); + + printf ("Tags to exclude when searching messages (separated by spaces) ["); + print_tag_list (search_exclude_tags, search_exclude_tags_len); + prompt ("]: "); + + if (strlen (response)) { + GPtrArray *tags = parse_tag_list (ctx, response); + + notmuch_config_set_search_exclude_tags (config, + (const char **) tags->pdata, + tags->len); + + g_ptr_array_free (tags, TRUE); + } + if (! notmuch_config_save (config)) { if (is_new) -- cgit v1.2.3 From d379e3a0e23f3af9d8dece4bd21f9393d9f42249 Mon Sep 17 00:00:00 2001 From: Jani Nikula Date: Sun, 11 Mar 2012 23:36:16 +0200 Subject: man: update SEE ALSO references in man pages Drop references to notmuch-part(1). Reference all man pages. Fix man page section of notmuch-dump(1). --- man/man1/notmuch-config.1 | 5 ++--- man/man1/notmuch-count.1 | 8 ++++---- man/man1/notmuch-dump.1 | 8 ++++---- man/man1/notmuch-new.1 | 8 ++++---- man/man1/notmuch-reply.1 | 8 ++++---- man/man1/notmuch-restore.1 | 8 ++++---- man/man1/notmuch-search.1 | 8 ++++---- man/man1/notmuch-show.1 | 8 ++++---- man/man1/notmuch-tag.1 | 8 ++++---- man/man1/notmuch.1 | 7 +++---- man/man5/notmuch-hooks.5 | 8 ++++---- man/man7/notmuch-search-terms.7 | 5 ++--- 12 files changed, 43 insertions(+), 46 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 57eee93..2205d28 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -129,9 +129,8 @@ Specifies the location of the notmuch configuration file. Notmuch will use ${HOME}/.notmuch\-config if this variable is not set. .SH SEE ALSO -\fBnotmuch\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), -\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), +\fBnotmuch\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-dump\fR(1), +\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 0d0ab5d..79dd6a5 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -44,7 +44,7 @@ Output the number of matching threads. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-dump\fR(1), -\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index bd7e274..4e24392 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -31,7 +31,7 @@ for details of the supported syntax for . .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index ccee738..19cef3d 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -64,7 +64,7 @@ Prevents hooks from being run. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-reply\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 7ed7f0f..0fb68b4 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -80,7 +80,7 @@ on issue found in multiple patches. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), -\fBnotmuch-part\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 8bd59e4..bcb765c 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -39,7 +39,7 @@ details. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-dump\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), +\fBnotmuch-reply\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 19d85df..72874d0 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -115,7 +115,7 @@ Limit the number of displayed results to N. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-reply\fR(1), -\fBnotmuch-restore\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), +\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 4c5db94..27a06b7 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -139,7 +139,7 @@ command. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), -\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), -\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), -\fBnotmuch-search-terms\fR(7), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), +\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), +\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), +\fBnotmuch-tag\fR(1) diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 8e0bb5c..9f62222 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -32,7 +32,7 @@ details. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), -\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), -\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), -\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), +\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), +\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), +\fBnotmuch-show\fR(1), diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 3ab1af5..6fd20e0 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -131,10 +131,9 @@ use ${HOME}/.notmuch\-config if this variable is not set. \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), \fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), -\fBnotmuch-part\fR(1), \fBnotmuch-reply\fR(1), -\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), -\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), -\fBnotmuch-tag\fR(1) +\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), +\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), +\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) The notmuch website: diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 1e459c0..ab40443 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -42,7 +42,7 @@ imported messages. .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-part\fR(1), -\fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search-terms\fR(7), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-dump\fR(1), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1), +\fBnotmuch-restore\fR(1), \fBnotmuch-search\fR(1), +\fBnotmuch-search-terms\fR(7), \fBnotmuch-show\fR(1), +\fBnotmuch-tag\fR(1) diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 09a699f..1d43042 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -135,7 +135,6 @@ current time: .SH SEE ALSO \fBnotmuch\fR(1), \fBnotmuch-config\fR(1), \fBnotmuch-count\fR(1), -\fBnotmuch-dump\fR(5), \fBnotmuch-hooks\fR(5), \fBnotmuch-part\fR(1), +\fBnotmuch-dump\fR(1), \fBnotmuch-hooks\fR(5), \fBnotmuch-new\fR(1), \fBnotmuch-reply\fR(1), \fBnotmuch-restore\fR(1), -\fBnotmuch-search\fR(1), \fBnotmuch-search\fR(1), -\fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) +\fBnotmuch-search\fR(1), \fBnotmuch-show\fR(1), \fBnotmuch-tag\fR(1) -- cgit v1.2.3 From d71cb5e45b2e27dea30bbca167af54f8403ff8a5 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sun, 18 Mar 2012 08:07:00 -0300 Subject: bump version to 0.12~rc2 --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index e58a1b5..8f7eb87 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.12~rc1' +__VERSION__ = '0.12~rc2' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 2205d28..fb023b8 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 79dd6a5..383252e 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 4e24392..7cfe08e 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-DUMP 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 19cef3d..1158bb2 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-NEW 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 0fb68b4..deb3ae1 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index bcb765c..333f488 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-RESTORE 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 72874d0..2cf830a 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 27a06b7..48c7e0b 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 9f62222..8a010e4 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-TAG 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 6fd20e0..3984314 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH 1 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index ab40443..2397c7e 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-HOOKS 5 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 1d43042..a2dde70 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-02-29 "Notmuch 0.12~rc1" +.TH NOTMUCH-SEARCH-TERMS 7 2012-03-18 "Notmuch 0.12~rc2" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index 0d4c53f..d885035 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12~rc1 +0.12~rc2 -- cgit v1.2.3 From 2f2529563002324337d8d3be1e5335d8a1ca7b47 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Tue, 6 Mar 2012 18:48:44 +0000 Subject: man: Update raw format documentation --- man/man1/notmuch-show.1 | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 7bf1d56..1215f91 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -84,12 +84,17 @@ http://homepage.ntlworld.com/jonathan.deboynepollard/FGA/mail-mbox-formats.html .TP 4 .BR raw " (default for a single part, see \-\-part)" -For a message, the original, raw content of the email message is -output. Consumers of this format should expect to implement MIME -decoding and similar functions. +For a message or an attached message part, the original, raw content +of the email message is output. Consumers of this format should expect +to implement MIME decoding and similar functions. For a single part (\-\-part) the raw part content is output after -performing any necessary MIME decoding. +performing any necessary MIME decoding. Note that messages with a +simple body still have two parts: part 0 is the whole message and part +1 is the body. + +For a multipart part, the part headers and body (including all child +parts) is output. The raw format must only be used with search terms matching single message. -- cgit v1.2.3 From 71855b72f702e8751c35f71c787a00d64a77b663 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Sun, 18 Mar 2012 10:32:38 -0600 Subject: man: Update notmuch-reply man page for JSON format. --- man/man1/notmuch-reply.1 | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index deb3ae1..ec8da1f 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -37,12 +37,17 @@ Supported options for include .RS .TP 4 -.BR \-\-format= ( default | headers\-only ) +.BR \-\-format= ( default | json | headers\-only ) .RS .TP 4 .BR default Includes subject and quoted message body. .TP +.BR json +Produces JSON output containing headers for a reply message and the +contents of the original message. This output can be used by a client +to create a reply message intelligently. +.TP .BR headers\-only Only produces In\-Reply\-To, References, To, Cc, and Bcc headers. .RE @@ -73,7 +78,8 @@ with a search string matching a single message, (such as id:), but it can be useful to reply to several messages at once. For example, when a series of patches are sent in a single thread, replying to the entire thread allows for the reply to comment -on issue found in multiple patches. +on issues found in multiple patches. The default format supports +replying to multiple messages at once, but the JSON format does not. .RE .RE -- cgit v1.2.3 From 92b48c8c98e29ee54ce603931b3abf4c7b521840 Mon Sep 17 00:00:00 2001 From: Adam Wolfe Gordon Date: Sun, 18 Mar 2012 10:32:39 -0600 Subject: man: Add --decrypt to reply flags --- man/man1/notmuch-reply.1 | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index ec8da1f..7ee3ceb 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -68,6 +68,16 @@ values from the first that contains something other than only the user's addresses. .RE .RE +.RS +.TP 4 +.B \-\-decrypt + +Decrypt any MIME encrypted parts found in the selected content +(ie. "multipart/encrypted" parts). Status of the decryption will be +reported (currently only supported with --format=json) and the +multipart/encrypted part will be replaced by the decrypted +content. +.RE See \fBnotmuch-search-terms\fR(7) for details of the supported syntax for . -- cgit v1.2.3 From c302bfa2f63fc1e59df6f842fe65d4d6ea258a33 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Mon, 19 Mar 2012 22:28:17 -0300 Subject: update version to 0.12 There may be a few NEWS changes after this, but no code (hopefully). --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 8f7eb87..24e1d4c 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.12~rc2' +__VERSION__ = '0.12' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index fb023b8..a746895 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-CONFIG 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 383252e..8de4345 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-COUNT 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 7cfe08e..f479e8b 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-DUMP 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 1158bb2..613658d 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-NEW 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index deb3ae1..bd95b5f 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-REPLY 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 333f488..db0b697 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-RESTORE 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 2cf830a..bf17220 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-SEARCH 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 48c7e0b..d69834a 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-SHOW 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 8a010e4..aa4546e 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-TAG 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 3984314..2afcc77 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH 1 2012-03-19 "Notmuch 0.12" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 2397c7e..9662bde 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-HOOKS 5 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index a2dde70..37ba9bb 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-03-18 "Notmuch 0.12~rc2" +.TH NOTMUCH-SEARCH-TERMS 7 2012-03-19 "Notmuch 0.12" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index d885035..c43e105 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12~rc2 +0.12 -- cgit v1.2.3 From 785c1e497f05cb89365669fea33cfbf9078a4b12 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Apr 2012 17:10:04 +0100 Subject: cli: move count to the new --exclude=(true|false|flag) naming scheme. Move the option --no-exclude to the --exclude= scheme. Since there is no way to flag messages only true and false are implemented. Note that, for consistency with other commands, this is implemented as a keyword option rather than a boolean option. --- man/man1/notmuch-count.1 | 5 +++-- notmuch-count.c | 17 ++++++++++++----- test/count | 4 ++-- 3 files changed, 17 insertions(+), 9 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 35ecc53..d6cbf07 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -41,9 +41,10 @@ Output the number of matching threads. .RS 4 .TP 4 -.BR \-\-no\-exclude +.BR \-\-exclude=(true|false) -Do not exclude the messages matching search.exclude_tags in the config file. +Specify whether to omit messages matching search.tag_exclude from the +count (the default) or not. .RE .RE .RE diff --git a/notmuch-count.c b/notmuch-count.c index 46b76ae..b76690c 100644 --- a/notmuch-count.c +++ b/notmuch-count.c @@ -26,6 +26,12 @@ enum { OUTPUT_MESSAGES, }; +/* The following is to allow future options to be added more easily */ +enum { + EXCLUDE_TRUE, + EXCLUDE_FALSE, +}; + int notmuch_count_command (void *ctx, int argc, char *argv[]) { @@ -35,7 +41,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) char *query_str; int opt_index; int output = OUTPUT_MESSAGES; - notmuch_bool_t no_exclude = FALSE; + int exclude = EXCLUDE_TRUE; unsigned int i; notmuch_opt_desc_t options[] = { @@ -43,7 +49,10 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) (notmuch_keyword_t []){ { "threads", OUTPUT_THREADS }, { "messages", OUTPUT_MESSAGES }, { 0, 0 } } }, - { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 }, + { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, + { "false", EXCLUDE_FALSE }, + { 0, 0 } } }, { 0, 0, 0, 0, 0 } }; @@ -78,7 +87,7 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) return 1; } - if (!no_exclude) { + if (exclude == EXCLUDE_TRUE) { const char **search_exclude_tags; size_t search_exclude_tags_length; @@ -88,8 +97,6 @@ notmuch_count_command (void *ctx, int argc, char *argv[]) notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); } - notmuch_query_set_omit_excluded_messages (query, TRUE); - switch (output) { case OUTPUT_MESSAGES: printf ("%u\n", notmuch_query_count_messages (query)); diff --git a/test/count b/test/count index b97fc06..fd387e5 100755 --- a/test/count +++ b/test/count @@ -53,9 +53,9 @@ test_expect_equal \ "1" \ "`notmuch count subject:deleted and tag:deleted`" -test_begin_subtest "count \"deleted\" messages, with --no-exclude" +test_begin_subtest "count \"deleted\" messages, --exclude=false" test_expect_equal \ "3" \ - "`notmuch count --no-exclude subject:deleted`" + "`notmuch count --exclude=false subject:deleted`" test_done -- cgit v1.2.3 From fd62a25f91c6ecdd6d60c86b4439321b8e84b309 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Apr 2012 17:10:05 +0100 Subject: cli: move search to the new --exclude= naming scheme. This commit replaces the --no-exclude option with a --exclude=(true|false|flag) option. The default is to omit the excluded messages. The flag option only makes sense if output=summary (as otherwise there is nowhere to print the flag). In summary output exclude=false and exclude=flag give almost identical output: they differ in that with the exclude=flag option the match count (i.e., the x in [x/n] in the output) is the number of matching non-excluded messages rather than the number of matching messages. Note this changes the default for output=summary when no --exclude= option is given: it used to default to flag and now defaults to true (i.e. omit excluded messages). This is neccesary to keep the cli output uncluttered and for speed reasons. --- man/man1/notmuch-search.1 | 12 +++++++++--- notmuch-search.c | 32 +++++++++++++++++++++++--------- 2 files changed, 32 insertions(+), 12 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 06d81a6..ebb61fc 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -114,9 +114,15 @@ Limit the number of displayed results to N. .RS 4 .TP 4 -.BR \-\-no\-exclude - -Do not exclude the messages matching search.exclude_tags in the config file. +.BR \-\-exclude=(true|false|flag) + +Specify whether to omit messages matching search.tag_exclude from the +search results (the default) or not. The extra option +.B flag +only has an effect when +.B --output=summary +In this case all matching threads are returned but the "match count" +is the number of matching non-excluded messages in the thread. .RE .SH SEE ALSO diff --git a/notmuch-search.c b/notmuch-search.c index f6061e4..1cc8430 100644 --- a/notmuch-search.c +++ b/notmuch-search.c @@ -210,9 +210,6 @@ do_search_threads (const search_format_t *format, int first_thread = 1; int i; - if (output == OUTPUT_THREADS) - notmuch_query_set_omit_excluded_messages (query, TRUE); - if (offset < 0) { offset += notmuch_query_count_threads (query); if (offset < 0) @@ -303,8 +300,6 @@ do_search_messages (const search_format_t *format, int first_message = 1; int i; - notmuch_query_set_omit_excluded_messages (query, TRUE); - if (offset < 0) { offset += notmuch_query_count_messages (query); if (offset < 0) @@ -376,7 +371,6 @@ do_search_tags (notmuch_database_t *notmuch, const char *tag; int first_tag = 1; - notmuch_query_set_omit_excluded_messages (query, TRUE); /* should the following only special case if no excluded terms * specified? */ @@ -422,6 +416,12 @@ do_search_tags (notmuch_database_t *notmuch, return 0; } +enum { + EXCLUDE_TRUE, + EXCLUDE_FALSE, + EXCLUDE_FLAG, +}; + int notmuch_search_command (void *ctx, int argc, char *argv[]) { @@ -435,7 +435,7 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) output_t output = OUTPUT_SUMMARY; int offset = 0; int limit = -1; /* unlimited */ - notmuch_bool_t no_exclude = FALSE; + int exclude = EXCLUDE_TRUE; unsigned int i; enum { NOTMUCH_FORMAT_JSON, NOTMUCH_FORMAT_TEXT } @@ -457,7 +457,11 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) { "files", OUTPUT_FILES }, { "tags", OUTPUT_TAGS }, { 0, 0 } } }, - { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'd', 0 }, + { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, + { "false", EXCLUDE_FALSE }, + { "flag", EXCLUDE_FLAG }, + { 0, 0 } } }, { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 }, { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 }, { 0, 0, 0, 0, 0 } @@ -505,7 +509,15 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) notmuch_query_set_sort (query, sort); - if (!no_exclude) { + if (exclude == EXCLUDE_FLAG && output != OUTPUT_SUMMARY) { + /* If we are not doing summary output there is nowhere to + * print the excluded flag so fall back on including the + * excluded messages. */ + fprintf (stderr, "Warning: this output format cannot flag excluded messages.\n"); + exclude = EXCLUDE_FALSE; + } + + if (exclude == EXCLUDE_TRUE || exclude == EXCLUDE_FLAG) { const char **search_exclude_tags; size_t search_exclude_tags_length; @@ -513,6 +525,8 @@ notmuch_search_command (void *ctx, int argc, char *argv[]) (config, &search_exclude_tags_length); for (i = 0; i < search_exclude_tags_length; i++) notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); + if (exclude == EXCLUDE_FLAG) + notmuch_query_set_omit_excluded (query, FALSE); } switch (output) { -- cgit v1.2.3 From 903327279c38d6750e8347eba23262fa487c6951 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Sat, 7 Apr 2012 17:10:06 +0100 Subject: cli: move show to the new --exclude= option naming scheme. This moves notmuch show to the --exclude=(true|false) naming scheme. When exclude=false show returns all threads that match including those that only match in an excluded message. The excluded messages are flagged. When exclude=true the behaviour depends on whether --entire-thread is set. If it is not set then show only returns the messages which match and are not excluded. If it is set then show returns all messages in the threads that match in a non-excluded message, flagging the excluded messages in these threads. The rationale is that it is awkward to use a thread with some missing messages. --- man/man1/notmuch-show.1 | 16 ++++++++++++++-- notmuch-client.h | 1 + notmuch-show.c | 50 ++++++++++++++++++++++++++++++------------------- 3 files changed, 46 insertions(+), 21 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index b81cce6..83cc575 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -135,9 +135,21 @@ content. .RS 4 .TP 4 -.B \-\-no-exclude +.BR \-\-exclude=(true|false) + +Specify whether to omit threads only matching search.tag_exclude from +the search results (the default) or not. In either case the excluded +message will be marked with the exclude flag (except when output=mbox +when there is nowhere to put the flag). + +If --entire-thread is specified then complete threads are returned +regardless (with the excluded flag being set when appropriate) but +threads that only match in an excluded message are not returned when +.B --exclude=true. + +The default is +.B --exclude=true. -Do not exclude the messages matching search.exclude_tags in the config file. .RE A common use of diff --git a/notmuch-client.h b/notmuch-client.h index 203ac49..880b153 100644 --- a/notmuch-client.h +++ b/notmuch-client.h @@ -99,6 +99,7 @@ typedef struct notmuch_show_format { typedef struct notmuch_show_params { notmuch_bool_t entire_thread; + notmuch_bool_t omit_excluded; notmuch_bool_t raw; int part; #ifdef GMIME_ATLEAST_26 diff --git a/notmuch-show.c b/notmuch-show.c index 0bf5e21..7af8e64 100644 --- a/notmuch-show.c +++ b/notmuch-show.c @@ -866,6 +866,7 @@ show_messages (void *ctx, { notmuch_message_t *message; notmuch_bool_t match; + notmuch_bool_t excluded; int first_set = 1; int next_indent; notmuch_status_t status, res = NOTMUCH_STATUS_SUCCESS; @@ -885,10 +886,11 @@ show_messages (void *ctx, message = notmuch_messages_get (messages); match = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_MATCH); + excluded = notmuch_message_get_flag (message, NOTMUCH_MESSAGE_FLAG_EXCLUDED); next_indent = indent; - if (match || params->entire_thread) { + if ((match && (!excluded || !params->omit_excluded)) || params->entire_thread) { status = show_message (ctx, format, message, indent, params); if (status && !res) res = status; @@ -996,6 +998,12 @@ enum { NOTMUCH_FORMAT_RAW }; +/* The following is to allow future options to be added more easily */ +enum { + EXCLUDE_TRUE, + EXCLUDE_FALSE, +}; + int notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) { @@ -1005,10 +1013,10 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) char *query_string; int opt_index, ret; const notmuch_show_format_t *format = &format_text; - notmuch_show_params_t params = { .part = -1 }; + notmuch_show_params_t params = { .part = -1, .omit_excluded = TRUE }; int format_sel = NOTMUCH_FORMAT_NOT_SPECIFIED; notmuch_bool_t verify = FALSE; - notmuch_bool_t no_exclude = FALSE; + int exclude = EXCLUDE_TRUE; notmuch_opt_desc_t options[] = { { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f', @@ -1017,11 +1025,14 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) { "mbox", NOTMUCH_FORMAT_MBOX }, { "raw", NOTMUCH_FORMAT_RAW }, { 0, 0 } } }, + { NOTMUCH_OPT_KEYWORD, &exclude, "exclude", 'x', + (notmuch_keyword_t []){ { "true", EXCLUDE_TRUE }, + { "false", EXCLUDE_FALSE }, + { 0, 0 } } }, { NOTMUCH_OPT_INT, ¶ms.part, "part", 'p', 0 }, { NOTMUCH_OPT_BOOLEAN, ¶ms.entire_thread, "entire-thread", 't', 0 }, { NOTMUCH_OPT_BOOLEAN, ¶ms.decrypt, "decrypt", 'd', 0 }, { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 }, - { NOTMUCH_OPT_BOOLEAN, &no_exclude, "no-exclude", 'n', 0 }, { 0, 0, 0, 0, 0 } }; @@ -1110,29 +1121,30 @@ notmuch_show_command (void *ctx, unused (int argc), unused (char *argv[])) return 1; } - /* if format=mbox then we can not output excluded messages as - * there is no way to make the exclude flag available */ - if (format_sel == NOTMUCH_FORMAT_MBOX) - notmuch_query_set_omit_excluded_messages (query, TRUE); - /* If a single message is requested we do not use search_excludes. */ if (params.part >= 0) ret = do_show_single (ctx, query, format, ¶ms); else { - if (!no_exclude) { - const char **search_exclude_tags; - size_t search_exclude_tags_length; - unsigned int i; - - search_exclude_tags = notmuch_config_get_search_exclude_tags - (config, &search_exclude_tags_length); - for (i = 0; i < search_exclude_tags_length; i++) - notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); + /* We always apply set the exclude flag. The + * exclude=true|false option controls whether or not we return + * threads that only match in an excluded message */ + const char **search_exclude_tags; + size_t search_exclude_tags_length; + unsigned int i; + + search_exclude_tags = notmuch_config_get_search_exclude_tags + (config, &search_exclude_tags_length); + for (i = 0; i < search_exclude_tags_length; i++) + notmuch_query_add_tag_exclude (query, search_exclude_tags[i]); + + if (exclude == EXCLUDE_FALSE) { + notmuch_query_set_omit_excluded (query, FALSE); + params.omit_excluded = FALSE; } + ret = do_show (ctx, query, format, ¶ms); } - notmuch_query_destroy (query); notmuch_database_close (notmuch); -- cgit v1.2.3 From 0ff54ab712c24263a1dd66ffd2b4266371f24830 Mon Sep 17 00:00:00 2001 From: Peter Wang Date: Sat, 14 Apr 2012 11:41:06 +1000 Subject: man: Document 'config list' command Document the 'config list' command and its output. --- man/man1/notmuch-config.1 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 395cb9c..a55dbef 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -9,6 +9,8 @@ notmuch-config \- Access notmuch configuration file. .B notmuch config set .RI "<" section ">.<" item "> [" value " ...]" +.B notmuch config list + .SH DESCRIPTION The @@ -35,6 +37,18 @@ If no values are provided, the specified configuration item will be removed from the configuration file. .RE +.RS 4 +.TP 4 +.B list +Every configuration item is printed to stdout, each on a separate line +of the form: + +.RI "" section "." item "=" value + +No additional whitespace surrounds the dot or equals sign characters. In a +multiple-value item (a list), the values are separated by semicolon characters. +.RE + The available configuration items are described below. .RS 4 -- cgit v1.2.3 From a4b10675bfe6ee90d84b9880b59c4f5ff15eed3a Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 8 May 2012 14:49:08 -0300 Subject: bump version to 0.13~rc1 --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 24e1d4c..25010f5 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.12' +__VERSION__ = '0.13~rc1' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index a55dbef..5c3b391 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-CONFIG 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index d6cbf07..0c87541 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-COUNT 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index f479e8b..50ec335 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-DUMP 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 613658d..b05d278 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-NEW 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 8666549..1f86b09 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-REPLY 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index db0b697..f393c04 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-RESTORE 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index ebb61fc..4b02f4e 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-SEARCH 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 83cc575..14a2a5c 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-SHOW 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index aa4546e..55f79f8 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-TAG 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 2afcc77..f7ee528 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH 1 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index 9662bde..aa0839a 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-HOOKS 5 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 37ba9bb..6af7a60 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-03-19 "Notmuch 0.12" +.TH NOTMUCH-SEARCH-TERMS 7 2012-05-08 "Notmuch 0.13~rc1" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index c43e105..80fa719 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.12 +0.13~rc1 -- cgit v1.2.3 From 3fb08bc1259f9a9d80617542da64443e7e63a6c4 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Tue, 15 May 2012 18:18:45 -0300 Subject: version: bump to 0.13 --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 25010f5..5945a50 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.13~rc1' +__VERSION__ = '0.13' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 5c3b391..8cc9773 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-CONFIG 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 0c87541..1eb70d1 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-COUNT 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 50ec335..b03f804 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-DUMP 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index b05d278..37af146 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-NEW 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 1f86b09..593df3b 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-REPLY 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index f393c04..ec16868 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-RESTORE 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 4b02f4e..608178c 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-SEARCH 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 14a2a5c..a7f0792 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-SHOW 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 55f79f8..346b188 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-TAG 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index f7ee528..465e324 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH 1 2012-05-15 "Notmuch 0.13" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index aa0839a..d9a86c7 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-HOOKS 5 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index 6af7a60..cbbafc1 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-05-08 "Notmuch 0.13~rc1" +.TH NOTMUCH-SEARCH-TERMS 7 2012-05-15 "Notmuch 0.13" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index 80fa719..f304084 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13~rc1 +0.13 -- cgit v1.2.3 From df96c93239b6e92e19f22f7759e7d1595c3fdcdd Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 25 May 2012 21:17:54 -0300 Subject: version: bump to 0.13.1 --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index 5945a50..cb1d625 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.13' +__VERSION__ = '0.13.1' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 8cc9773..8192b9d 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-CONFIG 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 1eb70d1..dd906f3 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-COUNT 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index b03f804..0a72f98 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-DUMP 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 37af146..4127632 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-NEW 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 593df3b..895f389 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-REPLY 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index ec16868..86e23fd 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-RESTORE 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 608178c..25e6a86 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-SEARCH 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index a7f0792..928e03c 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 346b188..17e0310 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-TAG 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 465e324..7465fbd 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH 1 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index d9a86c7..e6ea3b2 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-HOOKS 5 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index cbbafc1..eae7c75 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-05-15 "Notmuch 0.13" +.TH NOTMUCH-SEARCH-TERMS 7 2012-05-25 "Notmuch 0.13.1" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index f304084..c317a91 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13 +0.13.1 -- cgit v1.2.3 From dc2877b2325537d5a546f3733f6b7dc620b07005 Mon Sep 17 00:00:00 2001 From: Jameson Graef Rollins Date: Wed, 23 May 2012 11:41:20 -0700 Subject: cli: fix documentation about --decrypt for show Forgot to mention that it implies --verify. --- man/man1/notmuch-show.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index a7f0792..03a99ea 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -130,7 +130,7 @@ Decrypt any MIME encrypted parts found in the selected content (ie. "multipart/encrypted" parts). Status of the decryption will be reported (currently only supported with --format=json) and the multipart/encrypted part will be replaced by the decrypted -content. +content. Implies --verify. .RE .RS 4 -- cgit v1.2.3 From 9d5f73db7a948ddbed710309e7dc2f7d65d0f7d4 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 2 Jun 2012 18:10:55 -0300 Subject: version: update to 0.13.2 --- bindings/python/notmuch/version.py | 2 +- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man1/notmuch.1 | 2 +- man/man5/notmuch-hooks.5 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- version | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) (limited to 'man') diff --git a/bindings/python/notmuch/version.py b/bindings/python/notmuch/version.py index cb1d625..90bcadb 100644 --- a/bindings/python/notmuch/version.py +++ b/bindings/python/notmuch/version.py @@ -1,2 +1,2 @@ # this file should be kept in sync with ../../../version -__VERSION__ = '0.13.1' +__VERSION__ = '0.13.2' diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 8192b9d..4f7985c 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-CONFIG 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-CONFIG 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-config \- Access notmuch configuration file. .SH SYNOPSIS diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index dd906f3..8029174 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-COUNT 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-COUNT 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-count \- Count messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 0a72f98..9c7dd84 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-DUMP 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-DUMP 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-dump \- Creates a plain-text dump of the tags of each message. diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index 4127632..cd83a88 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-NEW 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-NEW 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-new \- Incorporate new mail into the notmuch database. .SH SYNOPSIS diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index 895f389..fb5114c 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-REPLY 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-REPLY 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-reply \- Constructs a reply template for a set of messages. diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 86e23fd..3156af7 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-RESTORE 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-RESTORE 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-restore \- Restores the tags from the given file (see notmuch dump). diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 25e6a86..5c72c4b 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-SEARCH 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-search \- Search for messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 928e03c..efd30a0 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SHOW 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-SHOW 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-show \- Show messages matching the given search terms. .SH SYNOPSIS diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 17e0310..27e682e 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,4 +1,4 @@ -.TH NOTMUCH-TAG 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-TAG 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-tag \- Add/remove tags for all messages matching the search terms. diff --git a/man/man1/notmuch.1 b/man/man1/notmuch.1 index 7465fbd..ebea4aa 100644 --- a/man/man1/notmuch.1 +++ b/man/man1/notmuch.1 @@ -16,7 +16,7 @@ .\" along with this program. If not, see http://www.gnu.org/licenses/ . .\" .\" Author: Carl Worth -.TH NOTMUCH 1 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH 1 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch \- thread-based email index, search, and tagging .SH SYNOPSIS diff --git a/man/man5/notmuch-hooks.5 b/man/man5/notmuch-hooks.5 index e6ea3b2..b914a29 100644 --- a/man/man5/notmuch-hooks.5 +++ b/man/man5/notmuch-hooks.5 @@ -1,4 +1,4 @@ -.TH NOTMUCH-HOOKS 5 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-HOOKS 5 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-hooks \- hooks for notmuch diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index eae7c75..c559ed6 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,4 +1,4 @@ -.TH NOTMUCH-SEARCH-TERMS 7 2012-05-25 "Notmuch 0.13.1" +.TH NOTMUCH-SEARCH-TERMS 7 2012-06-01 "Notmuch 0.13.2" .SH NAME notmuch-search-terms \- Syntax for notmuch queries diff --git a/version b/version index c317a91..9beb74d 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.13.1 +0.13.2 -- cgit v1.2.3 From e4b429039f2598c34ad2a690beb122219705fd5f Mon Sep 17 00:00:00 2001 From: Tomi Ollila Date: Mon, 25 Jun 2012 00:53:27 +0300 Subject: manpages: consistent "format" for NAME section The NAME section in manpages generally doesn't start with capital letter (unless the word is 'proper noun') and doesn't end with period. Notmuch manual pages now matches that "format". --- man/man1/notmuch-config.1 | 2 +- man/man1/notmuch-count.1 | 2 +- man/man1/notmuch-dump.1 | 2 +- man/man1/notmuch-new.1 | 2 +- man/man1/notmuch-reply.1 | 2 +- man/man1/notmuch-restore.1 | 2 +- man/man1/notmuch-search.1 | 2 +- man/man1/notmuch-show.1 | 2 +- man/man1/notmuch-tag.1 | 2 +- man/man7/notmuch-search-terms.7 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-config.1 b/man/man1/notmuch-config.1 index 4f7985c..2ee555d 100644 --- a/man/man1/notmuch-config.1 +++ b/man/man1/notmuch-config.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-CONFIG 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-config \- Access notmuch configuration file. +notmuch-config \- access notmuch configuration file .SH SYNOPSIS .B notmuch config get diff --git a/man/man1/notmuch-count.1 b/man/man1/notmuch-count.1 index 8029174..8551ab2 100644 --- a/man/man1/notmuch-count.1 +++ b/man/man1/notmuch-count.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-COUNT 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-count \- Count messages matching the given search terms. +notmuch-count \- count messages matching the given search terms .SH SYNOPSIS .B notmuch count diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 9c7dd84..64abf01 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-DUMP 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-dump \- Creates a plain-text dump of the tags of each message. +notmuch-dump \- creates a plain-text dump of the tags of each message .SH SYNOPSIS diff --git a/man/man1/notmuch-new.1 b/man/man1/notmuch-new.1 index cd83a88..e01f2eb 100644 --- a/man/man1/notmuch-new.1 +++ b/man/man1/notmuch-new.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-NEW 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-new \- Incorporate new mail into the notmuch database. +notmuch-new \- incorporate new mail into the notmuch database .SH SYNOPSIS .B notmuch new diff --git a/man/man1/notmuch-reply.1 b/man/man1/notmuch-reply.1 index fb5114c..5aa86c0 100644 --- a/man/man1/notmuch-reply.1 +++ b/man/man1/notmuch-reply.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-REPLY 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-reply \- Constructs a reply template for a set of messages. +notmuch-reply \- constructs a reply template for a set of messages .SH SYNOPSIS diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 3156af7..18281c7 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-RESTORE 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-restore \- Restores the tags from the given file (see notmuch dump). +notmuch-restore \- restores the tags from the given file (see notmuch dump) .SH SYNOPSIS diff --git a/man/man1/notmuch-search.1 b/man/man1/notmuch-search.1 index 5c72c4b..b42eb2c 100644 --- a/man/man1/notmuch-search.1 +++ b/man/man1/notmuch-search.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-SEARCH 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-search \- Search for messages matching the given search terms. +notmuch-search \- search for messages matching the given search terms .SH SYNOPSIS .B notmuch search diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 4aab17c..b51a54c 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-SHOW 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-show \- Show messages matching the given search terms. +notmuch-show \- show messages matching the given search terms .SH SYNOPSIS .B notmuch show diff --git a/man/man1/notmuch-tag.1 b/man/man1/notmuch-tag.1 index 27e682e..d810e1b 100644 --- a/man/man1/notmuch-tag.1 +++ b/man/man1/notmuch-tag.1 @@ -1,6 +1,6 @@ .TH NOTMUCH-TAG 1 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-tag \- Add/remove tags for all messages matching the search terms. +notmuch-tag \- add/remove tags for all messages matching the search terms .SH SYNOPSIS .B notmuch tag diff --git a/man/man7/notmuch-search-terms.7 b/man/man7/notmuch-search-terms.7 index c559ed6..b8ab52d 100644 --- a/man/man7/notmuch-search-terms.7 +++ b/man/man7/notmuch-search-terms.7 @@ -1,7 +1,7 @@ .TH NOTMUCH-SEARCH-TERMS 7 2012-06-01 "Notmuch 0.13.2" .SH NAME -notmuch-search-terms \- Syntax for notmuch queries +notmuch-search-terms \- syntax for notmuch queries .SH SYNOPSIS -- cgit v1.2.3 From 52e50f78238fe1b2ed46fabcb203b37048a3ae44 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 24 Jul 2012 19:23:29 +0100 Subject: man: update man page for the new --body=true|false option --- man/man1/notmuch-show.1 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index b51a54c..506583a 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -152,6 +152,22 @@ The default is .RE +.RS 4 +.TP 4 +.B \-\-body=(true|false) + +If true (the default) +.B notmuch show +includes the bodies of the messages in the output; if false, +bodies are omitted. +.B --body=false +is only implemented for the json format and it is incompatible with +.B --part > 0. + +This is useful if the caller only needs the headers as body-less +output is much faster and substantially smaller. +.RE + A common use of .B notmuch show is to display a single thread of email messages. For this, use a -- cgit v1.2.3 From a89a2b276f59d8a97a7e3e6213f385aab79094a1 Mon Sep 17 00:00:00 2001 From: Mark Walters Date: Tue, 24 Jul 2012 19:57:57 +0100 Subject: man: show: update man page for entire-thread and json. Previously in notmuch show --format=json implied --entire-thread. This is still the default but it is now possible to disable this. Update the manpage to reflect this. --- man/man1/notmuch-show.1 | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-show.1 b/man/man1/notmuch-show.1 index 506583a..765b22c 100644 --- a/man/man1/notmuch-show.1 +++ b/man/man1/notmuch-show.1 @@ -24,11 +24,14 @@ Supported options for include .RS 4 .TP 4 -.B \-\-entire\-thread +.B \-\-entire\-thread=(true|false) -By default only those messages that match the search terms will be -displayed. With this option, all messages in the same thread as any -matched message will be displayed. +If true, +.B notmuch show +outputs all messages in the thread of any message matching the search +terms; if false, it outputs only the matching messages. For +.B --format=json +this defaults to true. For other formats, this defaults to false. .RE .RS 4 @@ -55,11 +58,13 @@ be nested. The output is formatted with Javascript Object Notation (JSON). This format is more robust than the text format for automated processing. The nested structure of multipart MIME messages is -reflected in nested JSON output. JSON output always includes all -messages in a matching thread; in effect +reflected in nested JSON output. By default JSON output includes all +messages in a matching thread; that is, by default, .B \-\-format=json -implies -.B \-\-entire\-thread +sets +.B "\-\-entire\-thread" +The caller can disable this behaviour by setting +.B \-\-entire\-thread=false .RE .RS 4 -- cgit v1.2.3 From 760e17488e6b11299f2971cf879b109b84816d14 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Fri, 3 Aug 2012 23:23:11 -0300 Subject: notmuch-dump: remove deprecated positional argument for output file The syntax --output=filename is a smaller change than deleting the output argument completely, and conceivably useful e.g. when running notmuch under a debugger. --- man/man1/notmuch-dump.1 | 5 ++--- notmuch-dump.c | 3 +-- test/dump-restore | 20 ++++++++------------ test/maildir-sync | 2 +- 4 files changed, 12 insertions(+), 18 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-dump.1 b/man/man1/notmuch-dump.1 index 64abf01..5d1e197 100644 --- a/man/man1/notmuch-dump.1 +++ b/man/man1/notmuch-dump.1 @@ -5,15 +5,14 @@ notmuch-dump \- creates a plain-text dump of the tags of each message .SH SYNOPSIS .B "notmuch dump" -.RI "[ <" filename "> ] [--]" +.RI "[ --output=<" filename "> ] [--]" .RI "[ <" search-term ">...]" .SH DESCRIPTION Dump tags for messages matching the given search terms. -Output is to the given filename, if any, or to stdout. Note that -using the filename argument is deprecated. +Output is to the given filename, if any, or to stdout. These tags are the only data in the notmuch database that can't be recreated from the messages themselves. The output of notmuch dump is diff --git a/notmuch-dump.c b/notmuch-dump.c index 3743214..d8186fb 100644 --- a/notmuch-dump.c +++ b/notmuch-dump.c @@ -44,7 +44,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) int opt_index; notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_POSITION, &output_file_name, 0, 0, 0 }, + { NOTMUCH_OPT_STRING, &output_file_name, "output", 'o', 0 }, { 0, 0, 0, 0, 0 } }; @@ -56,7 +56,6 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[]) } if (output_file_name) { - fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n"); output = fopen (output_file_name, "w"); if (output == NULL) { fprintf (stderr, "Error opening %s for writing: %s\n", diff --git a/test/dump-restore b/test/dump-restore index 439e998..c7801cf 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -53,16 +53,12 @@ test_expect_success 'Restore with nothing to do, III' \ test_expect_success 'Invalid restore invocation' \ 'test_must_fail notmuch restore dump.expected another_one' -test_begin_subtest "dump outfile" -notmuch dump dump-outfile.actual +test_begin_subtest "dump --output=outfile" +notmuch dump --output=dump-outfile.actual test_expect_equal_file dump.expected dump-outfile.actual -test_begin_subtest "dump outfile # deprecated" -test_expect_equal "Warning: the output file argument of dump is deprecated."\ - "$(notmuch dump /dev/null 2>&1)" - -test_begin_subtest "dump outfile --" -notmuch dump dump-1-arg-dash.actual -- +test_begin_subtest "dump --output=outfile --" +notmuch dump --output=dump-1-arg-dash.actual -- test_expect_equal_file dump.expected dump-1-arg-dash.actual # Note, we assume all messages from cworth have a message-id @@ -74,12 +70,12 @@ test_begin_subtest "dump -- from:cworth" notmuch dump -- from:cworth > dump-dash-cworth.actual test_expect_equal_file dump-cworth.expected dump-dash-cworth.actual -test_begin_subtest "dump outfile from:cworth" -notmuch dump dump-outfile-cworth.actual from:cworth +test_begin_subtest "dump --output=outfile from:cworth" +notmuch dump --output=dump-outfile-cworth.actual from:cworth test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual -test_begin_subtest "dump outfile -- from:cworth" -notmuch dump dump-outfile-dash-inbox.actual -- from:cworth +test_begin_subtest "dump --output=outfile -- from:cworth" +notmuch dump --output=dump-outfile-dash-inbox.actual -- from:cworth test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual test_done diff --git a/test/maildir-sync b/test/maildir-sync index cd7d241..0914fa5 100755 --- a/test/maildir-sync +++ b/test/maildir-sync @@ -124,7 +124,7 @@ mv $MAIL_DIR/cur/adding-replied-tag:2,RS $MAIL_DIR/cur/adding-replied-tag:2,S mv $MAIL_DIR/cur/adding-s-flag:2,S $MAIL_DIR/cur/adding-s-flag:2, mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS -notmuch dump dump.txt +notmuch dump --output=dump.txt NOTMUCH_NEW >/dev/null notmuch restore dump.txt output=$(ls $MAIL_DIR/cur) -- cgit v1.2.3 From 19c824c3fd7be29a2257cdd530ee23074c978d63 Mon Sep 17 00:00:00 2001 From: David Bremner Date: Sat, 4 Aug 2012 09:55:45 -0300 Subject: notmuch-restore: replace positional argument for input with option Since notmuch dump doesn't use positional arguments anymore, it seems better to be consistent. --- man/man1/notmuch-restore.1 | 2 +- notmuch-restore.c | 2 +- test/dump-restore | 8 ++++---- test/maildir-sync | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'man') diff --git a/man/man1/notmuch-restore.1 b/man/man1/notmuch-restore.1 index 18281c7..d0d50dd 100644 --- a/man/man1/notmuch-restore.1 +++ b/man/man1/notmuch-restore.1 @@ -6,7 +6,7 @@ notmuch-restore \- restores the tags from the given file (see notmuch dump) .B "notmuch restore" .RB [ "--accumulate" ] -.RI "[ <" filename "> ]" +.RI "[ --input=<" filename "> ]" .SH DESCRIPTION diff --git a/notmuch-restore.c b/notmuch-restore.c index 4f4096e..08d5adc 100644 --- a/notmuch-restore.c +++ b/notmuch-restore.c @@ -122,7 +122,7 @@ notmuch_restore_command (unused (void *ctx), int argc, char *argv[]) synchronize_flags = notmuch_config_get_maildir_synchronize_flags (config); notmuch_opt_desc_t options[] = { - { NOTMUCH_OPT_POSITION, &input_file_name, 0, 0, 0 }, + { NOTMUCH_OPT_STRING, &input_file_name, "input", 'i', 0 }, { NOTMUCH_OPT_BOOLEAN, &accumulate, "accumulate", 'a', 0 }, { 0, 0, 0, 0, 0 } }; diff --git a/test/dump-restore b/test/dump-restore index c7801cf..f25f7cf 100755 --- a/test/dump-restore +++ b/test/dump-restore @@ -19,7 +19,7 @@ test_expect_success 'Dumping all tags II' \ test_expect_success 'Clearing all tags' \ 'sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected && - notmuch restore clear.expected && + notmuch restore --input=clear.expected && notmuch dump > clear.actual && test_cmp clear.expected clear.actual' @@ -30,7 +30,7 @@ test_expect_success 'Accumulate original tags' \ test_cmp dump-ABC_DEF.expected dump.actual' test_expect_success 'Restoring original tags' \ - 'notmuch restore dump.expected && + 'notmuch restore --input=dump.expected && notmuch dump > dump.actual && test_cmp dump.expected dump.actual' @@ -40,7 +40,7 @@ test_expect_success 'Restore with nothing to do' \ test_cmp dump.expected dump.actual' test_expect_success 'Restore with nothing to do, II' \ - 'notmuch restore --accumulate dump.expected && + 'notmuch restore --accumulate --input=dump.expected && notmuch dump > dump.actual && test_cmp dump.expected dump.actual' @@ -51,7 +51,7 @@ test_expect_success 'Restore with nothing to do, III' \ # notmuch restore currently only considers the first argument. test_expect_success 'Invalid restore invocation' \ - 'test_must_fail notmuch restore dump.expected another_one' + 'test_must_fail notmuch restore --input=dump.expected another_one' test_begin_subtest "dump --output=outfile" notmuch dump --output=dump-outfile.actual diff --git a/test/maildir-sync b/test/maildir-sync index 0914fa5..0fc742a 100755 --- a/test/maildir-sync +++ b/test/maildir-sync @@ -126,7 +126,7 @@ mv $MAIL_DIR/cur/adding-with-s-flag:2,S $MAIL_DIR/cur/adding-with-s-flag:2,RS mv $MAIL_DIR/cur/message-to-move-to-cur:2,S $MAIL_DIR/cur/message-to-move-to-cur:2,DS notmuch dump --output=dump.txt NOTMUCH_NEW >/dev/null -notmuch restore dump.txt +notmuch restore --input=dump.txt output=$(ls $MAIL_DIR/cur) test_expect_equal "$output" "$expected" -- cgit v1.2.3