output file argument to notmuch dump.

output file argument to notmuch dump.

[David Bremner]

[-- Attachment #1: Type: text/plain, Size: 948 bytes --]


I'd like to add a search term argument to notmuch dump (see
id:"87wrcijn1w.fsf@zancas.localnet" and followup for context). The
"notmuch" way would be to have

    notmuch dump <search-term>

do the right thing, and that is easy enough _except_ that 

   notmuch dump foo

writes the output to file foo.

I see several options.

1) just delete the output file option from notmuch-dump, and use shell
   redirection. So far I don't see a non-contrived example when writing
   an output file directly is useful, but maybe that is just a failure
   of imagination.

2) delete the output file option and a global "--write" option that 
   calls freopen(... stdout). As a bonus(?) this would work for any 
   notmuch command.

3) leave the output option alone and implement a --query=foo option for 
   notmuch dump. This would be the most backward compatible of course,
   but also confusing for users.

Thoughts?

d



[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]

Re: output file argument to notmuch dump.

[Dmitry Kurochkin]

On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
> 
> I'd like to add a search term argument to notmuch dump (see
> id:"87wrcijn1w.fsf@zancas.localnet" and followup for context). The
> "notmuch" way would be to have
> 
>     notmuch dump <search-term>
> 
> do the right thing, and that is easy enough _except_ that 
> 
>    notmuch dump foo
> 
> writes the output to file foo.
> 
> I see several options.
> 
> 1) just delete the output file option from notmuch-dump, and use shell
>    redirection. So far I don't see a non-contrived example when writing
>    an output file directly is useful, but maybe that is just a failure
>    of imagination.
> 
> 2) delete the output file option and a global "--write" option that 
>    calls freopen(... stdout). As a bonus(?) this would work for any 
>    notmuch command.
> 
> 3) leave the output option alone and implement a --query=foo option for 
>    notmuch dump. This would be the most backward compatible of course,
>    but also confusing for users.
> 
> Thoughts?
> 

IMHO 1[+2] is the way.  It breaks the dump command interface, but would
make it consistent with other commands.  Implementing the second option
(for all commands) is nice but independent and optional.  Also, perhaps
--output, --output-file or smth would a better name than --write.

Regards,
  Dmitry

> d
> 
> 
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: output file argument to notmuch dump.

[David Bremner]

[-- Attachment #1: Type: text/plain, Size: 603 bytes --]

On Fri, 07 Oct 2011 04:37:56 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:
> On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:

> IMHO 1[+2] is the way.  It breaks the dump command interface, but would
> make it consistent with other commands.  Implementing the second option
> (for all commands) is nice but independent and optional.  Also, perhaps
> --output, --output-file or smth would a better name than --write.

I'm not fussy about the name, except that --output is taken, and I
thought there might be some benefit of making options have unique prefixes.

d

[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]

Re: output file argument to notmuch dump.

[Tom Prince]

On Thu, 06 Oct 2011 21:53:57 -0300, David Bremner <bremner@unb.ca> wrote:
> On Fri, 07 Oct 2011 04:37:56 +0400, Dmitry Kurochkin <dmitry.kurochkin@gmail.com> wrote:
> > On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
> 
> > IMHO 1[+2] is the way.  It breaks the dump command interface, but would
> > make it consistent with other commands.  Implementing the second option
> > (for all commands) is nice but independent and optional.  Also, perhaps
> > --output, --output-file or smth would a better name than --write.
> 
> I'm not fussy about the name, except that --output is taken, and I
> thought there might be some benefit of making options have unique
> prefixes.

Is -o/--output taken before the subcommand? i.e.
notmuch -o <dumpfile> dump <query> <terms>
Or would that be to confusing?

(-o is fairly standard for stdout redirection, so it would be nice to
use that for notmuch, as well.)

  Tom

Re: output file argument to notmuch dump.

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 843 bytes --]

On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
> I see several options.
> 
> 1) just delete the output file option from notmuch-dump, and use shell
>    redirection. So far I don't see a non-contrived example when writing
>    an output file directly is useful, but maybe that is just a failure
>    of imagination.
> 
> 2) delete the output file option and a global "--write" option that 
>    calls freopen(... stdout). As a bonus(?) this would work for any 
>    notmuch command.

I strongly support either of these two options (they're basically the
same as far as I'm concerned).  The consistency that this would provide
with rest of the notmuch commands alone kind of makes this a no-brainer
in my opinion.  And I certainly don't see this particular CLI breakage
as an issue either.

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: output file argument to notmuch dump.

[Jesse Rosenthal]

On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
> 1) just delete the output file option from notmuch-dump, and use shell
>    redirection. So far I don't see a non-contrived example when writing
>    an output file directly is useful, but maybe that is just a failure
>    of imagination.
> 
> 2) delete the output file option and a global "--write" option that 
>    calls freopen(... stdout). As a bonus(?) this would work for any 
>    notmuch command.

Either of these seem like the right approach to me. I might favor (1)
just a bit so I don't have to choose between different ways of doing the
same thing, but that's a small point. As Jamie said, they're pretty
much the same.

--Jesse

Re: output file argument to notmuch dump.

[Tomi Ollila]

On Fri 07 Oct 2011 13:23, Jesse Rosenthal <jrosenthal@jhu.edu> writes:

> On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
>> 1) just delete the output file option from notmuch-dump, and use shell
>>    redirection. So far I don't see a non-contrived example when writing
>>    an output file directly is useful, but maybe that is just a failure
>>    of imagination.
>> 
>> 2) delete the output file option and a global "--write" option that 
>>    calls freopen(... stdout). As a bonus(?) this would work for any 
>>    notmuch command.
>
> Either of these seem like the right approach to me. I might favor (1)
> just a bit so I don't have to choose between different ways of doing the
> same thing, but that's a small point. As Jamie said, they're pretty
> much the same.

The option 2, i.e. optional --write (or -o|--output) should be available;
someone may run notmuch without using environment that provides
redirections (or it is just plain simpler to give the command line option
instead of doing redirections).

> --Jesse

Tomi

Re: output file argument to notmuch dump.

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 571 bytes --]

On Fri, 07 Oct 2011 14:15:39 +0300, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> The option 2, i.e. optional --write (or -o|--output) should be available;
> someone may run notmuch without using environment that provides
> redirections (or it is just plain simpler to give the command line option
> instead of doing redirections).

If that were the case then none of the other notmuch commands would work
in the environment either.  If that's a concern, then notmuch should
have a generic --redirect option that works for all commands, as Tom
suggested out earlier.

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: output file argument to notmuch dump.

[Tomi Ollila]

On Fri 07 Oct 2011 20:22, Jameson Graef Rollins <jrollins@finestructure.net> writes:

> On Fri, 07 Oct 2011 14:15:39 +0300, Tomi Ollila <tomi.ollila@iki.fi> wrote:
>> The option 2, i.e. optional --write (or -o|--output) should be available;
>> someone may run notmuch without using environment that provides
>> redirections (or it is just plain simpler to give the command line option
>> instead of doing redirections).
>
> If that were the case then none of the other notmuch commands would work
> in the environment either.  If that's a concern, then notmuch should
> have a generic --redirect option that works for all commands, as Tom
> suggested out earlier.

Good point. I Agree. So, no spesific --write|-o|--output for dump is my
current vote.

>
> jamie.

Tomi

Re: output file argument to notmuch dump.

[David Bremner]

[-- Attachment #1: Type: text/plain, Size: 869 bytes --]

On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
> 
> I'd like to add a search term argument to notmuch dump (see
> id:"87wrcijn1w.fsf@zancas.localnet" and followup for context). The
> "notmuch" way would be to have
> 
>     notmuch dump <search-term>
> 
> do the right thing

Another option occured to me that is consistent at least with notmuch
tag and notmuch show would be to support the following transitional
syntaxes

        notmuch dump file
        notmuch dump file [--] search terms
        notmuch dump -- search terms

the first two could then be deprecated, and eventually the syntax

    notmuch dump search terms 

could be enabled.

the question of whether to support 

    notmuch dump --file foo.txt

or something like 

   notmuch --stdout=foo.txt dump

could be dealt with later.

David

[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]

(no subject)

[david]

OK, here is my proposal to add search terms to notmuch dump.

Most of the work is in argument processing. It would be nice if we
could factor some of that out.

02be821 notmuch-dump: deprecate use of output file argument.          
2b7781d test: all dump-restore tests should be working now
7a203d6 notmuch-dump: treat any remaining arguments after the filename as search t
be762d9 notmuch-dump: update handling of file name argument
d6715d7 test: add tests for command line arguments to notmuch-dump
08e76cc test: update dump-restore to use redirection instead of filename args

 notmuch-dump.c    |   37 ++++++++++++++++++++++++++-----------
 test/dump-restore |   39 ++++++++++++++++++++++++++++++++++-----
 2 files changed, 60 insertions(+), 16 deletions(-)

[PATCH 1/6] test: update dump-restore to use redirection instead of filename args

[david]

From: David Bremner <bremner@debian.org>

The idea here is that we want to deprecate the use of arguments to
dump and restore to specify paths, since in particular we want to use
the non-option arguments to dump to form a query.
---
 test/dump-restore |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/dump-restore b/test/dump-restore
index a4de370..96c4f19 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -6,17 +6,17 @@ add_email_corpus
 
 test_expect_success "Dumping all tags" "generate_message &&
 notmuch new &&
-notmuch dump dump.expected"
+notmuch dump > dump.expected"
 
 test_begin_subtest "Clearing all tags"
 sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected
-notmuch restore clear.expected
-notmuch dump clear.actual
+notmuch restore < clear.expected
+notmuch dump > clear.actual
 test_expect_equal "$(< clear.actual)" "$(< clear.expected)"
 
 test_begin_subtest "Restoring original tags"
-notmuch restore dump.expected
-notmuch dump dump.actual
+notmuch restore < dump.expected
+notmuch dump > dump.actual
 test_expect_equal "$(< dump.actual)" "$(< dump.expected)"
 
 test_expect_success "Restore with nothing to do" "notmuch restore dump.expected"
-- 
1.7.6.3

[PATCH 2/6] test: add tests for command line arguments to notmuch-dump

[david]

From: David Bremner <bremner@debian.org>

The plan is to add the possibility of search terms after the file name,
and the use of -- to stop looking for an output file name.
---
 test/dump-restore |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 deletions(-)

diff --git a/test/dump-restore b/test/dump-restore
index 96c4f19..699337c 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -8,6 +8,34 @@ test_expect_success "Dumping all tags" "generate_message &&
 notmuch new &&
 notmuch dump > dump.expected"
 
+test_begin_subtest "dump outfile"
+notmuch dump dump-outfile.actual
+test_expect_equal_file dump.expected dump-outfile.actual
+
+test_begin_subtest "dump outfile --"
+notmuch dump 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
+# containing cworth.org
+
+grep cworth\.org dump.expected > dump-cworth.expected
+
+test_begin_subtest "dump -- from:cworth"
+test_subtest_known_broken
+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"
+test_subtest_known_broken
+notmuch dump dump-outfile-cworth.actual from:cworth
+test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual
+
+test_begin_subtest "dump outfile -- from:cworth"
+test_subtest_known_broken
+notmuch dump dump-outfile-dash-inbox.actual -- from:cworth
+test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
+
 test_begin_subtest "Clearing all tags"
 sed -e "s/(\([^(]*\))$/()/" < dump.expected > clear.expected
 notmuch restore < clear.expected
-- 
1.7.6.3

[PATCH 3/6] notmuch-dump: update handling of file name argument

[david]

From: David Bremner <bremner@debian.org>

We permit -- as an "option processing terminator".

Currently this does not do anything useful, but we plan to add
search terms after the --.
---
 notmuch-dump.c |   27 ++++++++++++++++-----------
 1 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 7e7bc17..610144e 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -26,7 +26,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_config_t *config;
     notmuch_database_t *notmuch;
     notmuch_query_t *query;
-    FILE *output;
+    FILE *output = stdout;
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
@@ -40,23 +40,28 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     if (notmuch == NULL)
 	return 1;
 
-    query = notmuch_query_create (notmuch, "");
-    if (query == NULL) {
-	fprintf (stderr, "Out of memory\n");
-	return 1;
-    }
-    notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
-
-    if (argc) {
+    if (argc && strcmp (argv[0], "--") != 0) {
 	output = fopen (argv[0], "w");
 	if (output == NULL) {
 	    fprintf (stderr, "Error opening %s for writing: %s\n",
 		     argv[0], strerror (errno));
 	    return 1;
 	}
-    } else {
-	output = stdout;
+	argc--;
+	argv++;
+    }
+
+    if (argc && strcmp (argv[0], "--") == 0){
+	argc--;
+	argv++;
+    }
+
+    query = notmuch_query_create (notmuch, "");
+    if (query == NULL) {
+	fprintf (stderr, "Out of memory\n");
+	return 1;
     }
+    notmuch_query_set_sort (query, NOTMUCH_SORT_MESSAGE_ID);
 
     for (messages = notmuch_query_search_messages (query);
 	 notmuch_messages_valid (messages);
-- 
1.7.6.3

[PATCH 4/6] notmuch-dump: treat any remaining arguments after the filename as search terms

[david]

From: David Bremner <bremner@debian.org>

The main motivation here is allow the fast dumping of tag data for
messages having certain tags.  In practice it seems too slow to pipe
dump to grep.
---
 notmuch-dump.c |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/notmuch-dump.c b/notmuch-dump.c
index 610144e..ac5d074 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -30,6 +30,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
     notmuch_messages_t *messages;
     notmuch_message_t *message;
     notmuch_tags_t *tags;
+    const char* query_str = "";
 
     config = notmuch_config_open (ctx, NULL, NULL);
     if (config == NULL)
@@ -56,7 +57,15 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 	argv++;
     }
 
-    query = notmuch_query_create (notmuch, "");
+    if (argc) {
+	query_str = query_string_from_args (notmuch, argc, argv);
+	if (query_str == NULL) {
+	    fprintf (stderr, "Out of memory.\n");
+	    return 1;
+	}
+    }
+ 
+    query = notmuch_query_create (notmuch, query_str);
     if (query == NULL) {
 	fprintf (stderr, "Out of memory\n");
 	return 1;
-- 
1.7.6.3

[PATCH 5/6] test: all dump-restore tests should be working now

[david]

From: David Bremner <bremner@debian.org>

3 x test_subtest_known_broken removed to tidy up the output.
---
 test/dump-restore |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/test/dump-restore b/test/dump-restore
index 699337c..d8db259 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -22,17 +22,14 @@ test_expect_equal_file dump.expected dump-1-arg-dash.actual
 grep cworth\.org dump.expected > dump-cworth.expected
 
 test_begin_subtest "dump -- from:cworth"
-test_subtest_known_broken
 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"
-test_subtest_known_broken
 notmuch dump dump-outfile-cworth.actual from:cworth
 test_expect_equal_file dump-cworth.expected dump-outfile-cworth.actual
 
 test_begin_subtest "dump outfile -- from:cworth"
-test_subtest_known_broken
 notmuch dump dump-outfile-dash-inbox.actual -- from:cworth
 test_expect_equal_file dump-cworth.expected dump-outfile-dash-inbox.actual
 
-- 
1.7.6.3

[PATCH 6/6] notmuch-dump: deprecate use of output file argument.

[david]

From: David Bremner <bremner@debian.org>

We print an intentionally non-specific message on stderr, since it
isn't clear if there will be some global output file argument to
replace.

We update the test suite atomically, since it relies on having the
same text in two files.
---
 notmuch-dump.c    |    1 +
 test/dump-restore |    4 ++++
 2 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/notmuch-dump.c b/notmuch-dump.c
index ac5d074..409c86a 100644
--- a/notmuch-dump.c
+++ b/notmuch-dump.c
@@ -42,6 +42,7 @@ notmuch_dump_command (unused (void *ctx), int argc, char *argv[])
 	return 1;
 
     if (argc && strcmp (argv[0], "--") != 0) {
+	fprintf (stderr, "Warning: the output file argument of dump is deprecated.\n");
 	output = fopen (argv[0], "w");
 	if (output == NULL) {
 	    fprintf (stderr, "Error opening %s for writing: %s\n",
diff --git a/test/dump-restore b/test/dump-restore
index d8db259..5f3f0db 100755
--- a/test/dump-restore
+++ b/test/dump-restore
@@ -12,6 +12,10 @@ test_begin_subtest "dump outfile"
 notmuch dump 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_expect_equal_file dump.expected dump-1-arg-dash.actual
-- 
1.7.6.3

Re:

[Thomas Schwinge]

[-- Attachment #1: Type: text/plain, Size: 2038 bytes --]

Hi!

On Mon, 10 Oct 2011 10:49:15 -0300, david@tethera.net wrote:
> OK, here is my proposal to add search terms to notmuch dump.

Having worked in the same area ;-), I felt competent to review this.  And
I definitely do like David's approach.  The patches look good, with the
following comments:

What's missing is adding (roughly) the same text to the notmuch manpage,
``notmuch help dump'', NEWS file.  These should be added to the
respective patches, for enhance functionality and deprecation of output
filename.

> 2b7781d test: all dump-restore tests should be working now
> 7a203d6 notmuch-dump: treat any remaining arguments after the filename as search t

I would suggest to combine these two into one patch: enhance
implementation (7a203d6) and update the tests (2b7781d) is one unit.

> d6715d7 test: add tests for command line arguments to notmuch-dump

Specifically:

On Mon, 10 Oct 2011 10:49:17 -0300, david@tethera.net wrote:
> The plan is to add the possibility of search terms after the file name,
> and the use of -- to stop looking for an output file name.
> ---
>  test/dump-restore |   28 ++++++++++++++++++++++++++++
>  1 files changed, 28 insertions(+), 0 deletions(-)
> 
> diff --git a/test/dump-restore b/test/dump-restore
> index 96c4f19..699337c 100755
> --- a/test/dump-restore
> +++ b/test/dump-restore
> @@ -8,6 +8,34 @@ test_expect_success "Dumping all tags" "generate_message &&
>  notmuch new &&
>  notmuch dump > dump.expected"
>  
> +test_begin_subtest "dump outfile"
> +notmuch dump dump-outfile.actual
> +test_expect_equal_file dump.expected dump-outfile.actual
> +
> +test_begin_subtest "dump outfile --"
> +notmuch dump dump-1-arg-dash.actual
> +test_expect_equal_file dump.expected dump-1-arg-dash.actual
> 
> [...]

I don't understand the purpose of the second test above.  Was this meant
to be ``notmuch dump dump-1-arg-dash.actual --'' (as suggested by the
description), or ``notmuch dump -- > dump-1-arg-dash.actual''?


Grüße,
 Thomas

[-- Attachment #2: Type: application/pgp-signature, Size: 489 bytes --]

Re:

[David Bremner]

On Sun, 16 Oct 2011 22:34:29 +0200, Thomas Schwinge <thomas@schwinge.name> wrote:

> Having worked in the same area ;-), I felt competent to review this.  And
> I definitely do like David's approach.  The patches look good, with the
> following comments:

Thanks for the review.  I pushed a modified version of the series which
I think fixed all of the things you noticed.

d

Re: output file argument to notmuch dump.

[Tomi Ollila]

On Sun 09 Oct 2011 19:01, David Bremner <bremner@unb.ca> writes:

> On Thu, 06 Oct 2011 21:20:40 -0300, David Bremner <bremner@unb.ca> wrote:
>> 
>> I'd like to add a search term argument to notmuch dump (see
>> id:"87wrcijn1w.fsf@zancas.localnet" and followup for context). The
>> "notmuch" way would be to have
>> 
>>     notmuch dump <search-term>
>> 
>> do the right thing
>
> Another option occured to me that is consistent at least with notmuch
> tag and notmuch show would be to support the following transitional
> syntaxes
>
>         notmuch dump file
>         notmuch dump file [--] search terms
>         notmuch dump -- search terms
>
> the first two could then be deprecated, and eventually the syntax
>
>     notmuch dump search terms 
>
> could be enabled.

In this case there would be 2 transitional syntaxes. IMHO 

'notmuch dump <search-terms>' causes least transitional pain.

> the question of whether to support 
>
>     notmuch dump --file foo.txt
>
> or something like 
>
>    notmuch --stdout=foo.txt dump

who about 

notmuch [--output-file=<file>] <command> ...

> could be dealt with later.
>
> David

Tomi

Re: output file argument to notmuch dump.

[David Bremner]

[-- Attachment #1: Type: text/plain, Size: 642 bytes --]

On Mon, 10 Oct 2011 16:59:06 +0300, Tomi Ollila <tomi.ollila@iki.fi> wrote:
> 
> In this case there would be 2 transitional syntaxes. IMHO 
> 
> 'notmuch dump <search-terms>' causes least transitional pain.
> 

I don't understand what you mean here. Can you elaborate?

  notmuch dump <search-terms> 

is not a transitional syntax, but rather a new syntax that breaks
existing scripts. 

The advantage of using -- here is that it allows things like

    notmuch dump --format=something-better -- --output

to search for --output (of course the query is then parsed a bit
surprisingly, but this is a different issue.)

d

[-- Attachment #2: Type: application/pgp-signature, Size: 315 bytes --]

Re: output file argument to notmuch dump.

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 1171 bytes --]

On Sun, 09 Oct 2011 13:01:53 -0300, David Bremner <bremner@unb.ca> wrote:
> Another option occured to me that is consistent at least with notmuch
> tag and notmuch show would be to support the following transitional
> syntaxes
> 
>         notmuch dump file
>         notmuch dump file [--] search terms
>         notmuch dump -- search terms
> 
> the first two could then be deprecated, and eventually the syntax
> 
>     notmuch dump search terms 
> 
> could be enabled.

Hey, David.  I think this is a fine approach, Go with the transitional
"--" separator for one release or so, with a deprecation warning, and
then move to the standard form in the release after that.

> the question of whether to support 
> 
>     notmuch dump --file foo.txt
> 
> or something like 
> 
>    notmuch --stdout=foo.txt dump
> 
> could be dealt with later.

I realize the later probably requires more work, since we would have to
replace all print calls with a new function, but I think it's the
cleaner and more elegant solution.  There's no reason to have an output
redirection option for "dump"s and not for any of the other commands.

jamie.



[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

Re: output file argument to notmuch dump.

[David Bremner]

On Mon, 10 Oct 2011 09:41:47 -0700, Jameson Graef Rollins <jrollins@finestructure.net> wrote:

> >    notmuch --stdout=foo.txt dump
> > 
> > could be dealt with later.
> 
> I realize the later probably requires more work, since we would have to
> replace all print calls with a new function, but I think it's the
> cleaner and more elegant solution.  There's no reason to have an output
> redirection option for "dump"s and not for any of the other commands.

As far as I know, freopen(3) makes this a one-liner. I think the hardest
part of this would be figuring out the name of the option ;)

d

Re: show-mode message/thread archiving improvements

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 479 bytes --]

v2 of this series to follow, based on some good feedback from David and
Aaron.

Reminder:

> The last patch changes the default keybind for the 'a' key to archive
> just the current message, and not the entire thread.  In my opinion this
> is a *much* more sensible binding for this key.  I actually rebound to
> this immediately after I started using notmuch long ago.  It also adds a
> new 'A' that performs the old function to archive the entire thread and
> move on.

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 835 bytes --]

(no subject)

[Jameson Graef Rollins]

Final v3 rework of this patch series:

* reworked pop-at-end patch to be much simpler (which also happens to
  get around other issues with this patch that dme had)
* added pop-at-end function to both show-next-...message functions
* fixed call to search-next-thread in show-next-thread function
* added patch at beginning to fix search thread navigation in show
  mode
* add patch at end to fix doc string
* Fix doc string

jamie.

Re:

[David Bremner]

On Tue, 24 Jan 2012 16:06:15 -0800, Jameson Graef Rollins <jrollins@finestructure.net> wrote:
> Final v3 rework of this patch series:
> 

pushed.

d

emacs: quote MML tags in replies

[Dmitry Kurochkin]

Hi Aaron.

Thanks for your work!  I took the liberty to do some cleanups for your
patch.  Below is a detailed list of changes.

Hope this helps.

Changes since v2:

* change patch names to be consistent with others:

  - s/emacs:/test:/ for the test patch

  - lower case the first word after colon in the patch title

* polish NEWS wording, move it to 0.12 section

* add comment to `mml-quote-region' call, as suggested by Tomi [1]

* fix and clean up the test:

  - set `notmuch-fcc-dirs' to nil to avoid adding the Fcc header,
    otherwise it breaks the test on other systems as pointed by
    David [2]

  - use default values for add_message parameters where possible

  - use a sane subject value in add_message

  - use shorter MML tag as produced by (mml-insert-part)

  - indenting and other minor cleanups

Regards,
  Dmitry

[1] id:"m2wr89ioos.fsf@guru.guru-group.fi"
[2] id:"87ehugzycb.fsf@zancas.localnet"

(no subject)

[David Bremner]

I rebased these against branch release (and copied a comment from
aaron's email), but the test fails there, as does the reply within emacs test.

FAIL   Reply within emacs
	--- emacs.24.expected	2012-02-02 03:55:14.000000000 +0000
	+++ emacs.24.output	2012-02-02 03:55:14.000000000 +0000
	@@ -1,8 +1,4 @@
	 From: Notmuch Test Suite <test_suite@notmuchmail.org>
	-To: user@example.com
	-Subject: Re: Testing message sent via SMTP
	-In-Reply-To: <XXX>
	-Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent
	+To: 
	+Subject: 
	 --text follows this line--
	-On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
	-> This is a test that messages are sent via SMTP
*ERROR*: Wrong type argument: integer-or-marker-p, nil
 FAIL   Quote MML tags in reply
	--- emacs.25.expected	2012-02-02 03:55:15.000000000 +0000
	+++ emacs.25.output	2012-02-02 03:55:15.000000000 +0000
	@@ -1,7 +1,4 @@
	 From: Notmuch Test Suite <test_suite@notmuchmail.org>
	 To: 
	-Subject: Re: Quote MML tags in reply
	-In-Reply-To: <test-emacs-mml-quoting@message.id>
	+Subject: 
	 --text follows this line--
	-On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
	-> <#!part disposition=inline>
*ERROR*: Wrong type argument: integer-or-marker-p, nil

Re:

[Pieter Praet]

On Thu,  2 Feb 2012 00:01:31 -0400, David Bremner <david@tethera.net> wrote:
> I rebased these against branch release (and copied a comment from
> aaron's email), but the test fails there, as does the reply within emacs test.
> 

Same issue here.


That mark was introduced in commit 03146f20, so isn't available in the
release branch yet.  Let's just use `point-max' instead, merge 'release'
into 'master', and change it back to `mark' there.  It's better to break
MML tags in the user's sig for a little while than leave this security
hole wide open.


Same issue wrt commit 66ecd906;  the citation line should still be:
  On Tue, 05 Jan 2001 15:43:57 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
instead of:
  On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:


Fixed patches follow, including a post-merge fix.


> FAIL   Reply within emacs
> 	--- emacs.24.expected	2012-02-02 03:55:14.000000000 +0000
> 	+++ emacs.24.output	2012-02-02 03:55:14.000000000 +0000
> 	@@ -1,8 +1,4 @@
> 	 From: Notmuch Test Suite <test_suite@notmuchmail.org>
> 	-To: user@example.com
> 	-Subject: Re: Testing message sent via SMTP
> 	-In-Reply-To: <XXX>
> 	-Fcc: /home/bremner/software/upstream/notmuch/test/tmp.emacs/mail/sent
> 	+To: 
> 	+Subject: 
> 	 --text follows this line--
> 	-On 01 Jan 2000 12:00:00 -0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
> 	-> This is a test that messages are sent via SMTP
> *ERROR*: Wrong type argument: integer-or-marker-p, nil
>  FAIL   Quote MML tags in reply
> 	--- emacs.25.expected	2012-02-02 03:55:15.000000000 +0000
> 	+++ emacs.25.output	2012-02-02 03:55:15.000000000 +0000
> 	@@ -1,7 +1,4 @@
> 	 From: Notmuch Test Suite <test_suite@notmuchmail.org>
> 	 To: 
> 	-Subject: Re: Quote MML tags in reply
> 	-In-Reply-To: <test-emacs-mml-quoting@message.id>
> 	+Subject: 
> 	 --text follows this line--
> 	-On Fri, 05 Jan 2001 15:43:57 +0000, Notmuch Test Suite <test_suite@notmuchmail.org> wrote:
> 	-> <#!part disposition=inline>
> *ERROR*: Wrong type argument: integer-or-marker-p, nil
> 
> 
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch


Peace

-- 
Pieter

(no subject)

[Damien Cassou]

From: Damien Cassou <damien.cassou@gmail.com>
Subject: [PATCH v4] emacs: display tags in notmuch-show with links
In-Reply-To: 

This patch obsoletes:
id:1355149964-27905-1-git-send-email-damien.cassou@gmail.com

[PATCH 1/4] emacs: Add a thread's tags to notmuch-show header-line
[PATCH 2/4] emacs: Make tags in notmuch-show header-line clickable
[PATCH 3/4] emacs: Make all tags in `notmuch-show' clickable
[PATCH 4/4] emacs: Add unit-tests for clickable tags

These patches make clickable all tags that appear in notmuch-show
buffers. Each tag is a link to open a new notmuch-search buffer for
this tag. Additionally, the buffer's header-line now shows the
thread's tags (clickable only if the `header-button' library is loaded
or loadable).

These patches are the first of an upcoming series whose goal is to
integrate notmuch-labeler into notmuch. See the following for more
details: https://github.com/DamienCassou/notmuch-labeler

With respect to v3, I took care of the comments you made:
- the header-line now updates when tags are changed
- the tags in the body stays clickable when tags are changed

Additionally, I added two unit tests to cover the above two comments
and fixed some others unit tests of mine.

Re:

[Mark Walters]

[-- Attachment #1: Type: text/plain, Size: 863 bytes --]


Hi

This is looking good: I have two comments the second of which is significant.

The first is do you want to sort (alphabetically) the headerline tags?
As it stands they are in the order they appear in the thread which is
probably not what is wanted.

The second is that there is a notmuch-show-tag-all functions to tag all
messages in the thread. Your patch is quadratic for the update (as it
calculates the list of thread tags once for each message). The attached
patch would avoid this and doesn't look too bad. (Note I retained
no-headerline-update as an optional argument in case there are out of
tree callers, eg users' .emacs files)

[Note this is not purely of academic interest: on my test large thread
(178 messages) updating the display after tagging all messages took some
seconds without my patch and almost no time with it.]

Best wishes 

Mark


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-mjw-tweak.patch --]
[-- Type: text/x-diff, Size: 2186 bytes --]

From ab15a4bdb50bcf6b2851806195bbe8bea3b099dc Mon Sep 17 00:00:00 2001
From: Mark Walters <markwalters1009@gmail.com>
Date: Thu, 13 Dec 2012 11:23:09 +0000
Subject: [PATCH] Avoid quadratic update

---
 emacs/notmuch-show.el |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/emacs/notmuch-show.el b/emacs/notmuch-show.el
index 93bce07..8dd6010 100644
--- a/emacs/notmuch-show.el
+++ b/emacs/notmuch-show.el
@@ -356,7 +356,7 @@ operation on the contents of the current buffer."
   "Return a string comprised of `n' spaces."
   (make-string n ? ))
 
-(defun notmuch-show-update-tags (tags)
+(defun notmuch-show-update-tags (tags &optional no-headerline-update)
   "Update the displayed tags of the current message."
   (save-excursion
     (goto-char (notmuch-show-message-top))
@@ -364,7 +364,8 @@ operation on the contents of the current buffer."
 	(let ((inhibit-read-only t))
 	  (replace-match (propertize (notmuch-tagger-format-tags tags)
 				     'face 'notmuch-tag-face)))))
-  (notmuch-show-update-header-line))
+  (unless no-headerline-update
+    (notmuch-show-update-header-line)))
 
 (defun notmuch-clean-address (address)
   "Try to clean a single email ADDRESS for display. Return a cons
@@ -1461,10 +1462,10 @@ current thread."
 (defun notmuch-show-get-depth ()
   (notmuch-show-get-prop :depth))
 
-(defun notmuch-show-set-tags (tags)
+(defun notmuch-show-set-tags (tags &optional no-headerline-update)
   "Set the tags of the current message."
   (notmuch-show-set-prop :tags tags)
-  (notmuch-show-update-tags tags))
+  (notmuch-show-update-tags tags no-headerline-update))
 
 (defun notmuch-show-get-tags ()
   "Return the tags of the current message."
@@ -1778,7 +1779,8 @@ See `notmuch-tag' for information on the format of TAG-CHANGES."
      (let* ((current-tags (notmuch-show-get-tags))
 	    (new-tags (notmuch-update-tags current-tags tag-changes)))
        (unless (equal current-tags new-tags)
-	 (notmuch-show-set-tags new-tags))))))
+	 (notmuch-show-set-tags new-tags t)))))
+  (notmuch-show-update-header-line))
 
 (defun notmuch-show-add-tag ()
   "Same as `notmuch-show-tag' but sets initial input to '+'."
-- 
1.7.9.1


[-- Attachment #3: Type: text/plain, Size: 1489 bytes --]




On Tue, 11 Dec 2012, Damien Cassou <damien.cassou@gmail.com> wrote:
> From: Damien Cassou <damien.cassou@gmail.com>
> Subject: [PATCH v4] emacs: display tags in notmuch-show with links
> In-Reply-To: 
>
> This patch obsoletes:
> id:1355149964-27905-1-git-send-email-damien.cassou@gmail.com
>
> [PATCH 1/4] emacs: Add a thread's tags to notmuch-show header-line
> [PATCH 2/4] emacs: Make tags in notmuch-show header-line clickable
> [PATCH 3/4] emacs: Make all tags in `notmuch-show' clickable
> [PATCH 4/4] emacs: Add unit-tests for clickable tags
>
> These patches make clickable all tags that appear in notmuch-show
> buffers. Each tag is a link to open a new notmuch-search buffer for
> this tag. Additionally, the buffer's header-line now shows the
> thread's tags (clickable only if the `header-button' library is loaded
> or loadable).
>
> These patches are the first of an upcoming series whose goal is to
> integrate notmuch-labeler into notmuch. See the following for more
> details: https://github.com/DamienCassou/notmuch-labeler
>
> With respect to v3, I took care of the comments you made:
> - the header-line now updates when tags are changed
> - the tags in the body stays clickable when tags are changed
>
> Additionally, I added two unit tests to cover the above two comments
> and fixed some others unit tests of mine.
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

(no subject)

[david]

Hi Gang;

Here are some proposed changes to the debian packaging for 0.15.

Most will probably be boring to people not familiar with debian
packaging, with the excepotion of 4/5, which has a shell pipeline with
two xargs in it, and almost can certainly be improved by several
readers of this list.

[PATCH 1/5] debian: change priority to optional.
[PATCH 2/5] debian: remove Dm-Upload-Allowed field.
[PATCH 3/5] debian/compat: upgrade to compat level 9
[PATCH 4/5] debian: add python 3 bindings
[PATCH 5/5] debian: note that ical bug is fixed

Re:

[David Bremner]

david@tethera.net writes:

> Hi Gang;
>
> Here are some proposed changes to the debian packaging for 0.15.
>
> Most will probably be boring to people not familiar with debian
> packaging, with the excepotion of 4/5, which has a shell pipeline with
> two xargs in it, and almost can certainly be improved by several
> readers of this list.

As Tomi suggested, I left this alone and pushed as is for now.

d

(no subject)

[Martin Owens]

Dear NotMuch,

I'm getting an error from the packages in Ubuntu 13.04 (beta) version
14.1 of python-notmuch:

  File "/usr/lib/python2.7/dist-packages/notmuch/database.py", line 156,
in __init__
    self.create(path)
  File "/usr/lib/python2.7/dist-packages/notmuch/database.py", line 191,
in create
    res = Database._create(_str(path), Database.MODE.READ_WRITE)
ctypes.ArgumentError: argument 2: <type 'exceptions.TypeError'>:
expected LP_LP_NotmuchDatabaseS instance instead of int

Looking at trunk it looks like this code was rewritten completely.
Should the packages be ignored and should trunk be used instead?

Best Regards, Martin Owens

Re:

[David Bremner]

Martin Owens <doctormo@gmail.com> writes:

> Looking at trunk it looks like this code was rewritten completely.
> Should the packages be ignored and should trunk be used instead?

Hi Martin;

Probably somebody needs to poke the folks at Ubuntu to sync from Debian
experimental again; the packages in experimental are very close to that
in git.

d

Re: [RFC Patch] start of sphinx based docs

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

>
> This looks like a good plan, only Makefile & conf.py is a bit noisy
> (like Jani's original Doxyfile)

That should be easy to fix. Whoevery posted that patch was incredibly
lazy ;).

> Also;
> centos 6$ sudo yum install python-sphinx
> ...
> Downloading Packages:
> (1/5): python-babel-0.9.4-5.1.el6.noarch.rpm             | 1.4 MB     00:07    
> (2/5): python-jinja2-2.2.1-1.el6.x86_64.rpm              | 464 kB     00:02    
> (3/5): python-pygments-1.1.1-1.el6.noarch.rpm            | 561 kB     00:02    
> (4/5): python-setuptools-0.6.10-3.el6.noarch.rpm         | 335 kB     00:01    
> (5/5): python-sphinx-0.6.6-2.el6.noarch.rpm              | 486 kB     00:02  
> ---------------------------------------------------------------------------
> Total                                           200 kB/s | 3.2 MB     00:16
>
> (python-docutils were already installed)
> I wonder how hard it is to install these on some systems...

It's definitely a concern. We could fall back to python-docutils to
generate the manpages, since there is a standalone rst2man script there.
There are some incompatibilities about how the TH line is generated, but
I think those could be hacked around, if people thought it was worth it.

d

(no subject)

[David Bremner]

Here's a second try.
       
       - less build system cruft

       - integrate into notmuch's build system

       - optionally build the man pages (but not info) using just
         python-docutils.

No doubt this could use polishing; I'm still looking for feedback on
the general approach.

Re:

[Mark Walters]

Hi

I have been playing with this. One thing that is worrying me a little at
the moment is that the man page looks different from before (imo less
nice). More importantly, I can't tweak the rst to get the generated
pages to look like the current ones (this could just be my lack of skill
with rst)

I do like the general approach but would like to make sure we can get
manpages (amongst other things) that we like from it. See below for one
example which I thought looked less nice

Best wishes

Mark



The particular  thing is the indentation for options (eg options in the
notmuch.1 page) In the original pages it looks like

OPTIONS
       Supported global options for notmuch include

           --help

               Print a synopsis of available commands and exit.

and in the new ones

OPTIONS
       Supported global options for notmuch include

       --help

       Print a synopsis of available commands and exit.

I find this makes it more difficult to scan the man page quickly.







On Tue, 28 Jan 2014, David Bremner <david@tethera.net> wrote:
> Here's a second try.
>        
>        - less build system cruft
>
>        - integrate into notmuch's build system
>
>        - optionally build the man pages (but not info) using just
>          python-docutils.
>
> No doubt this could use polishing; I'm still looking for feedback on
> the general approach.
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re:

[David Bremner]

Mark Walters <markwalters1009@gmail.com> writes:

>
> The particular  thing is the indentation for options (eg options in the
> notmuch.1 page) In the original pages it looks like
>
> OPTIONS
>        Supported global options for notmuch include
>
>            --help
>
>                Print a synopsis of available commands and exit.
>
> and in the new ones
>
> OPTIONS
>        Supported global options for notmuch include
>
>        --help
>
>        Print a synopsis of available commands and exit.
>
> I find this makes it more difficult to scan the man page quickly.

This rst is mainly autogenerated, and hence a bit ugly.

This particular example doesn't seem too hard to fix; try replacing the
relevant bit of notmuch.rst with


Supported global options for \ **notmuch**\  include

  \ --help
    Print a synopsis of available commands and exit.

  \ --version
    Print the installed version of notmuch, and exit.

  \ --config=FILE
    Specify the configuration file to use. This overrides any
    configuration file specified by ${NOTMUCH_CONFIG}.

or

Supported global options for \ **notmuch**\  include

--help         Print a synopsis of available commands and exit.

--version      Print the installed version of notmuch, and exit.

--config=FILE  Specify the configuration file to use. This overrides any
               configuration file specified by ${NOTMUCH_CONFIG}.

--help    Print a synopsis of available commands and exit.


The latter is an "option list" [1], so I guess is the most official way
to do it.

The former is a more generic "definition list" 


[1]
http://docutils.sourceforge.net/docs/ref/rst/restructuredtext.html#option-lists

Re: v2 man page build fixups

[Tomi Ollila]

On Tue, Mar 11 2014, David Bremner <david@tethera.net> wrote:

> Here is an improved version of somewhat hasty series of last night.
>
> It incorporates fixups from Jani that he sent to me off list.

I played with the series trying various tricks and all seems to
work fine. Also it is nice to see that one line in prerst2man.py
is fixed to better shape :D

Also a command line, should anyone ever need it (I doubt ;)

$ make SPHINXBUILD=sphinx-1.0-build HAVE_SPHINX=1 build-man

worked fine.

+1

Tomi

(no subject)

[David Bremner]

Several people observed a problem with the test T010-help not finding
the man pages anymore. To fix that, I had change the previous fix:
instead of flattening the rst2man output into one directory, I had to
move the sphinx output into a hierarchy.

Patches 1 and 3 should be the same as 

	id:1394539555-28334-1-git-send-email-david@tethera.net

Re:

[Tomi Ollila]

On Thu, Mar 13 2014, David Bremner <david@tethera.net> wrote:

> Several people observed a problem with the test T010-help not finding
> the man pages anymore. To fix that, I had change the previous fix:
> instead of flattening the rst2man output into one directory, I had to
> move the sphinx output into a hierarchy.

These patches fix my build and tests pass. +1

Database upgraded (real men don't use backups or how did it go ?).

Tomi


>
> Patches 1 and 3 should be the same as 
>
> 	id:1394539555-28334-1-git-send-email-david@tethera.net
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re:

[David Bremner]

David Bremner <david@tethera.net> writes:

> Several people observed a problem with the test T010-help not finding
> the man pages anymore. To fix that, I had change the previous fix:
> instead of flattening the rst2man output into one directory, I had to
> move the sphinx output into a hierarchy.
>
> Patches 1 and 3 should be the same as 
>
> 	id:1394539555-28334-1-git-send-email-david@tethera.net
>

pushed this series

d

(no subject)

[David Bremner]

The first of these fixes a build failure on Debian Linux/armhf (and
OS/X). If the patch seems ok, I'd like to roll it into a bug fix
release.  The second is more of a suggestion to make that atomicity
test easier to debug, since it seems to find the dark corners of gdb.

Re:

[Jameson Graef Rollins]

[-- Attachment #1: Type: text/plain, Size: 498 bytes --]

On Tue, May 06 2014, David Bremner <david@tethera.net> wrote:
> The first of these fixes a build failure on Debian Linux/armhf (and
> OS/X). If the patch seems ok, I'd like to roll it into a bug fix
> release.  The second is more of a suggestion to make that atomicity
> test easier to debug, since it seems to find the dark corners of gdb.

Hey, David.  It looks like Charles's series fixes some of these same
issues and more:

id:1399395748-44920-1-git-send-email-cceleri@cs.stanford.edu

jamie.

[-- Attachment #2: Type: application/pgp-signature, Size: 818 bytes --]

Re:

[Tomi Ollila]

On Tue, May 06 2014, David Bremner <david@tethera.net> wrote:

> The first of these fixes a build failure on Debian Linux/armhf (and
> OS/X). If the patch seems ok, I'd like to roll it into a bug fix
> release.  The second is more of a suggestion to make that atomicity
> test easier to debug, since it seems to find the dark corners of gdb.

Series LGTM.

Tomi

(no subject)

[David Bremner]

This is in some sense a successor to 

     id:cover.1411914914.git.jani@nikula.org

It includes the first two patches of that series verbatim, and adds
some tests.

Re:

[David Bremner]

David Bremner <david@tethera.net> writes:

> This is in some sense a successor to 
>
>      id:cover.1411914914.git.jani@nikula.org
>
> It includes the first two patches of that series verbatim, and adds
> some tests.

I should have said _almost_ verbatim; it marks some tests non-broken.

Re:

[Jani Nikula]

On Sat, 04 Oct 2014, David Bremner <david@tethera.net> wrote:
> This is in some sense a successor to 
>
>      id:cover.1411914914.git.jani@nikula.org
>
> It includes the first two patches of that series verbatim, and adds
> some tests.

I like it, very nice. Start pushing and add the post-insert hook patch
from my series on top?  ;)

BR,
Jani.

Re: [PATCH 1/3] doc: add details about Xapian search syntax

[David Bremner]

David Bremner <david@tethera.net> writes:

> Questions related to the way that probabilistic prefixes and phrases
> are handled come up quite often and it is nicer to have the documentation self contained.  Hopefully putting it in subsections prevents it from being overwhelming.

Pushed the first patch to master.

d

(no subject)

[David Bremner]

This has Jani's suggestions fixed, along with a couple of other trivial patches.

I'll mark them ready at this point.

Re:

[David Bremner]

David Bremner <david@tethera.net> writes:

> This has Jani's suggestions fixed, along with a couple of other trivial patches.
>
> I'll mark them ready at this point.

I pushed these, with Trevor's suggested changes.

d

(no subject)

[matt]

From: Matthew Lear <matt@bubblegen.co.uk>
To: notmuch@notmuchmail.org
Cc: Matthew Lear <matt@bubblegen.co.uk>
Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.
Date: Tue, 11 Oct 2016 22:24:18 +0100
Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk>
X-Mailer: git-send-email 2.4.10

If an encrypted multipart message is received which contains html and
notmuch-multipart/alternative-discouraged is set to discourage "text/plain",
any encrypted parts are not decrypted during generation of the reply
text. This fixes that problem by making sure notmuch-mua-reply does
that.
---
 emacs/notmuch-mua.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
index c567173..f333655 100644
--- a/emacs/notmuch-mua.el
+++ b/emacs/notmuch-mua.el
@@ -251,6 +251,10 @@ mutiple parts get a header."
 		       (notmuch-show-max-text-part-size 0)
 		       ;; Insert headers for parts as appropriate for replying.
 		       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
+		       ;; Ensure that any encrypted parts are
+		       ;; decrypted during the generation of the reply
+		       ;; text.
+		       (notmuch-show-process-crypto process-crypto)
 		       ;; Don't indent multipart sub-parts.
 		       (notmuch-show-indent-multipart nil))
 		    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
-- 
2.4.10

Re:

[Mark Walters]

On Tue, 11 Oct 2016, matt@bubblegen.co.uk wrote:
> From: Matthew Lear <matt@bubblegen.co.uk>
> To: notmuch@notmuchmail.org
> Cc: Matthew Lear <matt@bubblegen.co.uk>
> Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.
> Date: Tue, 11 Oct 2016 22:24:18 +0100
> Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk>
> X-Mailer: git-send-email 2.4.10
>
> If an encrypted multipart message is received which contains html and
> notmuch-multipart/alternative-discouraged is set to discourage "text/plain",
> any encrypted parts are not decrypted during generation of the reply
> text. This fixes that problem by making sure notmuch-mua-reply does
> that.

Hi

I haven't tested this but it looks correct: more broadly I think this is
needed whenever notmuch-show has to get a part directly rather than just
from the sexp reply.

Best wishes

Mark


> ---
>  emacs/notmuch-mua.el | 4 ++++
>  1 file changed, 4 insertions(+)
>
> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
> index c567173..f333655 100644
> --- a/emacs/notmuch-mua.el
> +++ b/emacs/notmuch-mua.el
> @@ -251,6 +251,10 @@ mutiple parts get a header."
>  		       (notmuch-show-max-text-part-size 0)
>  		       ;; Insert headers for parts as appropriate for replying.
>  		       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
> +		       ;; Ensure that any encrypted parts are
> +		       ;; decrypted during the generation of the reply
> +		       ;; text.
> +		       (notmuch-show-process-crypto process-crypto)
>  		       ;; Don't indent multipart sub-parts.
>  		       (notmuch-show-indent-multipart nil))
>  		    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
> -- 
> 2.4.10
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch

Re:

[Mark Walters]

On Wed, 12 Oct 2016, Mark Walters <markwalters1009@gmail.com> wrote:
> On Tue, 11 Oct 2016, matt@bubblegen.co.uk wrote:
>> From: Matthew Lear <matt@bubblegen.co.uk>
>> To: notmuch@notmuchmail.org
>> Cc: Matthew Lear <matt@bubblegen.co.uk>
>> Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.
>> Date: Tue, 11 Oct 2016 22:24:18 +0100
>> Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk>
>> X-Mailer: git-send-email 2.4.10
>>
>> If an encrypted multipart message is received which contains html and
>> notmuch-multipart/alternative-discouraged is set to discourage "text/plain",
>> any encrypted parts are not decrypted during generation of the reply
>> text. This fixes that problem by making sure notmuch-mua-reply does
>> that.
>
> Hi
>
> I haven't tested this but it looks correct: more broadly I think this is
> needed whenever notmuch-show has to get a part directly rather than just
> from the sexp reply.

Hi

Just to confirm I have now tested this -- it compiles and test suite
passes. (Note I don't have suitable encrypted messages to test).

Anyway LGTM +1

Best wishes

Mark



>
> Best wishes
>
> Mark
>
>
>> ---
>>  emacs/notmuch-mua.el | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
>> index c567173..f333655 100644
>> --- a/emacs/notmuch-mua.el
>> +++ b/emacs/notmuch-mua.el
>> @@ -251,6 +251,10 @@ mutiple parts get a header."
>>  		       (notmuch-show-max-text-part-size 0)
>>  		       ;; Insert headers for parts as appropriate for replying.
>>  		       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
>> +		       ;; Ensure that any encrypted parts are
>> +		       ;; decrypted during the generation of the reply
>> +		       ;; text.
>> +		       (notmuch-show-process-crypto process-crypto)
>>  		       ;; Don't indent multipart sub-parts.
>>  		       (notmuch-show-indent-multipart nil))
>>  		    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
>> -- 
>> 2.4.10
>>
>> _______________________________________________
>> notmuch mailing list
>> notmuch@notmuchmail.org
>> https://notmuchmail.org/mailman/listinfo/notmuch

Re:

[David Bremner]

matt@bubblegen.co.uk writes:

> From: Matthew Lear <matt@bubblegen.co.uk>
> To: notmuch@notmuchmail.org
> Cc: Matthew Lear <matt@bubblegen.co.uk>
> Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.
> Date: Tue, 11 Oct 2016 22:24:18 +0100
> Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk>
> X-Mailer: git-send-email 2.4.10

Pushed to master. For future reference it would be nice if the actual
git send-email output made to the list, so I don't have to fix up the
commit message by hand.

(no subject)

[Matt Armstrong]

This supercedes
id:1476207707-21827-1-git-send-email-marmstrong@google.com with
changes steming from Mark's helpful feedback.

Re:

[Matt Armstrong]

Matt Armstrong <marmstrong@google.com> writes:

> This supercedes
> id:1476207707-21827-1-git-send-email-marmstrong@google.com with
> changes steming from Mark's helpful feedback.

Apologies for the lack of a subject here.  I'm still learning the ins
and outs of 'git send-email'.  I can't say I'd call it a friendly
facility.  :)

Re:

[Matthew Lear]

[-- Attachment #1: Type: text/plain, Size: 2594 bytes --]

Hi Mark. Excellent :-) I'll look out for it in the repository at some point soon. Cheers,   Matt 
-------- Original message --------From: Mark Walters <markwalters1009@gmail.com> Date: 15/10/2016  08:09  (GMT+00:00) To: matt@bubblegen.co.uk, notmuch@notmuchmail.org, matt@bubblegen.co.uk Subject: Re: 

On Wed, 12 Oct 2016, Mark Walters <markwalters1009@gmail.com> wrote:
> On Tue, 11 Oct 2016, matt@bubblegen.co.uk wrote:
>> From: Matthew Lear <matt@bubblegen.co.uk>
>> To: notmuch@notmuchmail.org
>> Cc: Matthew Lear <matt@bubblegen.co.uk>
>> Subject: [PATCH] Fix reply to encrypted mail when discouraging plain text.
>> Date: Tue, 11 Oct 2016 22:24:18 +0100
>> Message-Id: <1476221058-10431-1-git-send-email-matt@bubblegen.co.uk>
>> X-Mailer: git-send-email 2.4.10
>>
>> If an encrypted multipart message is received which contains html and
>> notmuch-multipart/alternative-discouraged is set to discourage "text/plain",
>> any encrypted parts are not decrypted during generation of the reply
>> text. This fixes that problem by making sure notmuch-mua-reply does
>> that.
>
> Hi
>
> I haven't tested this but it looks correct: more broadly I think this is
> needed whenever notmuch-show has to get a part directly rather than just
> from the sexp reply.

Hi

Just to confirm I have now tested this -- it compiles and test suite
passes. (Note I don't have suitable encrypted messages to test).

Anyway LGTM +1

Best wishes

Mark



>
> Best wishes
>
> Mark
>
>
>> ---
>>  emacs/notmuch-mua.el | 4 ++++
>>  1 file changed, 4 insertions(+)
>>
>> diff --git a/emacs/notmuch-mua.el b/emacs/notmuch-mua.el
>> index c567173..f333655 100644
>> --- a/emacs/notmuch-mua.el
>> +++ b/emacs/notmuch-mua.el
>> @@ -251,6 +251,10 @@ mutiple parts get a header."
>>  		       (notmuch-show-max-text-part-size 0)
>>  		       ;; Insert headers for parts as appropriate for replying.
>>  		       (notmuch-show-insert-header-p-function notmuch-mua-reply-insert-header-p-function)
>> +		       ;; Ensure that any encrypted parts are
>> +		       ;; decrypted during the generation of the reply
>> +		       ;; text.
>> +		       (notmuch-show-process-crypto process-crypto)
>>  		       ;; Don't indent multipart sub-parts.
>>  		       (notmuch-show-indent-multipart nil))
>>  		    ;; We don't want sigstatus buttons (an information leak and usually wrong anyway).
>> -- 
>> 2.4.10
>>
>> _______________________________________________
>> notmuch mailing list
>> notmuch@notmuchmail.org
>> https://notmuchmail.org/mailman/listinfo/notmuch

[-- Attachment #2: Type: text/html, Size: 3660 bytes --]

(no subject)

[Tomi Ollila]

This implementation adds add_exit_function (and rm_exit_function)
which can also be used for other things in the future.

Now that I did this simpler way would be to just check for
existence of $GNUPGHOME for indication to exit gpg processes.

If that path is taken this series can be used for future reference
if need for atexit functionality arises.

From Tomi Ollila <tomi.ollila@iki.fi> # This line is ignored.
From: Tomi Ollila <tomi.ollila@iki.fi>
Subject: stop gpg-agent (among other) processes at test module exit
In-Reply-To: 

Re:

[David Bremner]

Tomi Ollila <tomi.ollila@iki.fi> writes:

> This implementation adds add_exit_function (and rm_exit_function)
> which can also be used for other things in the future.
>

Pushed to master.

d

Re: [PATCH] Add Emacs' imenu support in notmuch-show and notmuch-search

[David Bremner]

Damien Cassou <damien@cassou.me> writes:

> David Bremner <david@tethera.net> writes:
>> I am indeed using the default. I think you forgot the screen 
>> shot. 
>
>
> indeed. Attached to this email.
>
>
>>> I can still get rid of indentation if you confirm you don't 
>>> want  it. 
>> 
>> I think so, although to be honest I never tried imenu before 
>> testing your patches, perhaps we should wait for other opinions. 
>
>
> I advise you to install counsel at least for that (I don't use it 
> for anything else).
>

OK, I see with counsel-imenu the current indexing by header lines is
reasonable. It might be improvable by adding the subject, but I'm not
sure about line lengths.

- maybe the docstrings should recomment counsel-imenu?
- I think the indentation should probably go to make it more
  usable with the builtin imenu

(no subject)

[Damien Cassou]

> OK, I see with counsel-imenu the current indexing by header lines is
> reasonable. It might be improvable by adding the subject, but I'm
> not sure about line lengths.
> - maybe the docstrings should recomment counsel-imenu?

I'm not sure as the function
`notmuch-show-imenu-extract-index-name-function` is private and there
are other imenu frontends available. What about a NEWS entry instead
along those lines:

    * Add Emacs' imenu support in notmuch-show and notmuch-search

    Emacs' major modes can facilitate navigation in their buffers by
    supporting Imenu. In such major modes, launching Imenu (M-x imenu)
    makes Emacs display a list of items (e.g., function definitions in
    a code buffer). Selecting an item from this list moves point to
    this item.

    This release adds Imenu support to both notmuch-show and
    notmuch-search buffers:

       * in notmuch-show, Imenu will present a list of all messages in
         the currently visible thread;

       * in notmuch-search, Imenu will present a list of all messages in the
         search buffer.

    We recommand an external imenu frontend, such as counsel-imenu,
    which will make the experience much better that the default `M-x
    imenu`.

> I think the indentation should probably go to make it more usable
> with the builtin imenu

I did that in the patch even though I liked it with indentation better.

Re:

[David Bremner]

Damien Cassou <damien@cassou.me> writes:

>> OK, I see with counsel-imenu the current indexing by header lines is
>> reasonable. It might be improvable by adding the subject, but I'm
>> not sure about line lengths.
>> - maybe the docstrings should recomment counsel-imenu?
>
> I'm not sure as the function
> `notmuch-show-imenu-extract-index-name-function` is private and there
> are other imenu frontends available. What about a NEWS entry instead
> along those lines:
>
>     * Add Emacs' imenu support in notmuch-show and notmuch-search
>
>     Emacs' major modes can facilitate navigation in their buffers by
>     supporting Imenu. In such major modes, launching Imenu (M-x imenu)
>     makes Emacs display a list of items (e.g., function definitions in
>     a code buffer). Selecting an item from this list moves point to
>     this item.
>
>     This release adds Imenu support to both notmuch-show and
>     notmuch-search buffers:
>
>        * in notmuch-show, Imenu will present a list of all messages in
>          the currently visible thread;
>
>        * in notmuch-search, Imenu will present a list of all messages in the
>          search buffer.
>
>     We recommand an external imenu frontend, such as counsel-imenu,
>     which will make the experience much better that the default `M-x
>     imenu`.

That sounds fine.

>> I think the indentation should probably go to make it more usable
>> with the builtin imenu
>
> I did that in the patch even though I liked it with indentation better.

I haven't had a chance to test the new version yet, but I think I know
what you mean from testing counsel-imenu. Is it worth adding a
customization variable so that the user can choose indentation if they
have a more sophisticated imenu front end?

d

Re:

[David Bremner]

David Bremner <david@tethera.net> writes:

>> I did that in the patch even though I liked it with indentation better.
>
> I haven't had a chance to test the new version yet, but I think I know
> what you mean from testing counsel-imenu. Is it worth adding a
> customization variable so that the user can choose indentation if they
> have a more sophisticated imenu front end?

So this version is ok with both builtin and counsel imenu front
ends. It's up to you. Do you want to leave the question of controllable
indentation for a later commit or add it now?

d

Re:

[Damien Cassou]

David Bremner <david@tethera.net> writes:

> David Bremner <david@tethera.net> writes: 
> 
>>> I did that in the patch even though I liked it with 
>>> indentation better. 
>> 
>> I haven't had a chance to test the new version yet, but I think 
>> I know what you mean from testing counsel-imenu. Is it worth 
>> adding a customization variable so that the user can choose 
>> indentation if they have a more sophisticated imenu front end? 
> 
> So this version is ok with both builtin and counsel imenu front 
> ends. It's up to you. Do you want to leave the question of 
> controllable indentation for a later commit or add it now? 

if you are ok to merge that right now, that would be perfect for 
me. Thanks. 

-- 
Damien Cassou
http://damiencassou.seasidehosting.st

"Success is the ability to go from one failure to another without
losing enthusiasm." --Winston Churchill

(no subject)

[Matthew Lear]

From: Matthew Lear <matt@bubblegen.co.uk>
To: notmuch@notmuchmail.org
Cc: Matthew Lear <matt@bubblegen.co.uk>
Subject: [PATCH] Update date search syntax.
Date: Thu,  1 Feb 2018 20:52:18 +0000
Message-Id: <20180201205218.4368-1-matt@bubblegen.co.uk>
X-Mailer: git-send-email 2.14.1

If searching using the date prefix and timestamps, each timestamp
is required to be prefixed with an @
Legacy syntax of <initial-timestamp>..<final-timestamp> without the
date prefix is still honoured, only without the @ specifiers.
---
 doc/man7/notmuch-search-terms.rst | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst
index 6d2bf62a..b6e7079a 100644
--- a/doc/man7/notmuch-search-terms.rst
+++ b/doc/man7/notmuch-search-terms.rst
@@ -124,10 +124,13 @@ date:<since>..<until> or date:<date>
     The time range can also be specified using timestamps with a
     syntax of:
 
-    <initial-timestamp>..<final-timestamp>
+    @<initial-timestamp>..@<final-timestamp>
 
     Each timestamp is a number representing the number of seconds
-    since 1970-01-01 00:00:00 UTC.
+    since 1970-01-01 00:00:00 UTC. A date range search using
+    timestamps is also permitted without using the date prefix and
+    @ specifiers, although this is considered legacy and pre-dates
+    the date prefix.
 
 lastmod:<initial-revision>..<final-revision>
     The **lastmod:** prefix can be used to restrict the result by the
-- 
2.14.1

Re:

[Jani Nikula]

On Thu, 01 Feb 2018, Matthew Lear <matt@bubblegen.co.uk> wrote:
> From: Matthew Lear <matt@bubblegen.co.uk>
> To: notmuch@notmuchmail.org
> Cc: Matthew Lear <matt@bubblegen.co.uk>
> Subject: [PATCH] Update date search syntax.
> Date: Thu,  1 Feb 2018 20:52:18 +0000
> Message-Id: <20180201205218.4368-1-matt@bubblegen.co.uk>
> X-Mailer: git-send-email 2.14.1
>
> If searching using the date prefix and timestamps, each timestamp
> is required to be prefixed with an @
> Legacy syntax of <initial-timestamp>..<final-timestamp> without the
> date prefix is still honoured, only without the @ specifiers.
> ---
>  doc/man7/notmuch-search-terms.rst | 7 +++++--
>  1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/doc/man7/notmuch-search-terms.rst b/doc/man7/notmuch-search-terms.rst
> index 6d2bf62a..b6e7079a 100644
> --- a/doc/man7/notmuch-search-terms.rst
> +++ b/doc/man7/notmuch-search-terms.rst
> @@ -124,10 +124,13 @@ date:<since>..<until> or date:<date>
>      The time range can also be specified using timestamps with a
>      syntax of:
>  
> -    <initial-timestamp>..<final-timestamp>
> +    @<initial-timestamp>..@<final-timestamp>

So I think I'd add the @ syntax in the DATE AND TIME SEARCH section,
maybe under a separate new heading, and just emphasize this here is
about the non-date prefixed thing.

BR,
Jani.
  
>      Each timestamp is a number representing the number of seconds
> -    since 1970-01-01 00:00:00 UTC.
> +    since 1970-01-01 00:00:00 UTC. A date range search using
> +    timestamps is also permitted without using the date prefix and
> +    @ specifiers, although this is considered legacy and pre-dates
> +    the date prefix.
>  
>  lastmod:<initial-revision>..<final-revision>
>      The **lastmod:** prefix can be used to restrict the result by the
> -- 
> 2.14.1
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> https://notmuchmail.org/mailman/listinfo/notmuch