[PATCH] test: remove useless test_emacs call from an emacs FCC test

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 17:12:04 -0700, Carl Worth  wrote:
> 
> Thanks for the catch. That was left over from some debugging I was doing
> while writing the patch originally.

I cherry-picked all three of these into the release branch.  I'm going
to skip the typo fixes for 0.6, unless convinced otherwise.

d

P.S. It would be great if people built the release branch and reported
any (new) problems.
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/9d6ae619/attachment-0001.pgp>


debian: Override RPATH_LDFLAGS

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 14:38:42 -0700, Carl Worth  wrote:
> 
> So, you'll want to test it, of course, but I think you can (and should)
> drop this override of RPATH_LDFLAGS from the Debian packaging now.

As you say, it seems to work without this patch. Revert pushed to
master.

d



libnotmuch: add linker script to declare only notmuch_* symbols as global.

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 14:35:58 -0700, Carl Worth  wrote:
> On Thu, 23 Jun 2011 03:20:05 -0700 (PDT), (David Bremner) wrote:
> Presumably you'll be updating the debian/libnotmuch1.symbols files as
> necessary next. (I assume the packaging scripts will guide you to do
> that anyway.)

Yes, this is now pushed, in 19f0ca7

d
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 315 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/fdcf7593/attachment.pgp>


[RFC][PATCH] tags_to_maildir_flags: Add option to not move messages from "new/" to "cur/"

2011-06-23 Thread Louis Rilling
notmuch_message_tags_to_maildir_flags() moves messages from maildir directory
"new/" to maildir directory "cur/", which makes messages lose their "new" status
in the MUA. However some users want to keep this "new" status after, for
instance, an auto-tagging of new messages.

This patch introduces notmuch_message_tags_to_maildir_flags_preserve(), which
does the same job as notmuch_message_tags_to_maildir_flags() except moving
from "maildir "new/" to maildir "cur/". A new option "preserve_new" is
introduced in "[maildir]" section of .notmuch-config, so that users can
configure whether commands "notmuch tag" and "notmuch restore" preserve the
"new" status or not.

Signed-off-by: Louis Rilling 
---
Hi,

I'm in the process of using notmuch, but the issue "addressed" by this patch
would make me change my habits a bit too fast. I use the "new" status for
quickly checking (often without reading) which emails I just received,
implementing some kind of context/mood/daytime-dependent quick filtering. I'd
also like to run a pre-tagging script automatically when synchronizing
periodically (and automatically too) my mailboxes. But the current behavior of
"notmuch tag" makes me lose my quick filtering ability.

This patch is mostly written for discussion. It is certainly not polished (API,
ABI, bindings) and not tested at all. In particular, I know that there are some
plans to customize flags synchronization, but I don't know how the library API
could/should be impacted.

Thanks for your comments!

Louis


 lib/message.cc|   33 +
 lib/notmuch.h |7 +++
 notmuch-client.h  |7 +++
 notmuch-config.c  |   35 ++-
 notmuch-restore.c |   10 --
 notmuch-tag.c |   10 --
 6 files changed, 89 insertions(+), 13 deletions(-)

diff --git a/lib/message.cc b/lib/message.cc
index 4b59fa9..c6c4160 100644
--- a/lib/message.cc
+++ b/lib/message.cc
@@ -1130,7 +1130,8 @@ static char*
 _new_maildir_filename (void *ctx,
   const char *filename,
   const char *flags_to_set,
-  const char *flags_to_clear)
+  const char *flags_to_clear,
+  bool preserve_new)
 {
 const char *info, *flags;
 unsigned int flag, last_flag;
@@ -1211,16 +1212,19 @@ _new_maildir_filename (void *ctx,
 }
 *s = '\0';

-/* If message is in new/ move it under cur/. */
-dir = (char *) _filename_is_in_maildir (filename_new);
-if (dir && STRNCMP_LITERAL (dir, "new/") == 0)
-   memcpy (dir, "cur/", 4);
+if (!preserve_new) {
+   /* If message is in new/ move it under cur/. */
+   dir = (char *) _filename_is_in_maildir (filename_new);
+   if (dir && STRNCMP_LITERAL (dir, "new/") == 0)
+   memcpy (dir, "cur/", 4);
+}

 return filename_new;
 }

-notmuch_status_t
-notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
+static notmuch_status_t
+_notmuch_message_tags_to_maildir_flags (notmuch_message_t *message,
+   bool preserve_new)
 {
 notmuch_filenames_t *filenames;
 const char *filename;
@@ -1240,7 +1244,8 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t 
*message)
continue;

filename_new = _new_maildir_filename (message, filename,
- to_set, to_clear);
+ to_set, to_clear,
+ preserve_new);
if (filename_new == NULL)
continue;

@@ -1281,6 +1286,18 @@ notmuch_message_tags_to_maildir_flags (notmuch_message_t 
*message)
 }

 notmuch_status_t
+notmuch_message_tags_to_maildir_flags (notmuch_message_t *message)
+{
+_notmuch_message_tags_to_maildir_flags(message, false);
+}
+
+notmuch_status_t
+notmuch_message_tags_to_maildir_flags_preserve (notmuch_message_t *message)
+{
+_notmuch_message_tags_to_maildir_flags(message, true);
+}
+
+notmuch_status_t
 notmuch_message_remove_all_tags (notmuch_message_t *message)
 {
 notmuch_private_status_t private_status;
diff --git a/lib/notmuch.h b/lib/notmuch.h
index e508309..eeddc17 100644
--- a/lib/notmuch.h
+++ b/lib/notmuch.h
@@ -978,6 +978,13 @@ notmuch_message_maildir_flags_to_tags (notmuch_message_t 
*message);
  */
 notmuch_status_t
 notmuch_message_tags_to_maildir_flags (notmuch_message_t *message);
+/* Rename message filename(s) to encode tags as maildir flags, without moving 
from new/ to cur/
+ *
+ * Same as notmuch_message_tags_to_maildir_flags, but messages living in
+ * directory "new" are not moved to neighboring directory "cur".
+ */
+notmuch_status_t
+notmuch_message_tags_to_maildir_flags_preserve (notmuch_message_t *message);

 /* Freeze the current state of 'message' within the database.
  *
diff --git a/notmuch-client.h b/notmuch-client.h
index 63be337..2372fe6 100644
--- a/notmuch-client.h
+++ b/notmuch-client.h
@@ -235,6 

[PATCH] test: remove useless test_emacs call from an emacs FCC test

2011-06-23 Thread Carl Worth
On Fri, 24 Jun 2011 03:59:33 +0400, Dmitry Kurochkin  wrote:
> ---
>  test/emacs |1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)

Thanks for the catch. That was left over from some debugging I was doing
while writing the patch originally.

All fixed.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/bc9fdcb9/attachment.pgp>


[PATCH] Add dir-locals style variables for C++, Elisp, and shell code.

2011-06-23 Thread Carl Worth
On Thu,  9 Jun 2011 21:28:51 -0400, Austin Clements  wrote:
> Also, slightly reformat dir-locals.el so that the settings align and
> to make it friendlier for future additions.

Thanks. Pushed.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/482e8fa8/attachment.pgp>


[PATCH] Do not attept to output part raw if part is not GMimePart.

2011-06-23 Thread Carl Worth
On Fri,  3 Jun 2011 10:01:06 -0700, Jameson Graef Rollins  wrote:
> This was a minor oversite in checking of part type when outputing
> content raw.  This was causing gmime was to throw an exception to
> stderr.
> 
> Unfortunately the gmime exception was not being caught by notmuch, or
> the test suite.  I'm not sure if notmuch should have done anything in
> this case, but certainly the test suite should be capable of detecting
> that something unexpected was output to stderr.

I'd like to investigate this case a little bit to help answer the
question of whether "notmuch should have done anything in this case".

But if I apply the patch then I won't be able to. ;-)

Can you give me instructions for how to replicate this bug before I
apply the patch?

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/a01197cc/attachment.pgp>


[PATCH] fixed typo in a comment

2011-06-23 Thread Carl Worth
On Sun, 29 May 2011 01:56:49 -0700, notmuch at dima.secretsauce.net wrote:
> From: Dima Kogan 
> 
>  This patch corrects a typo

Thanks for the patch, Dima!

This is now fixed.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/374b342b/attachment.pgp>


[PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.

2011-06-23 Thread Carl Worth
On Fri, 24 Jun 2011 02:58:23 +0400, Dmitry Kurochkin  wrote:
> Well, I should have prepared a better commit message from the
> beginning.  Then no pushing might have been needed :)

That, or a test case, (which would have clued me in to read the correct
interpretation of the original commit message).

Regardless, the fix is in place now, and that's what matters.

Thanks again,

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/3692c6f1/attachment.pgp>


[PATCH] fix sum moar typos

2011-06-23 Thread Carl Worth
On Mon, 20 Jun 2011 22:14:21 +0200, Pieter Praet  wrote:
> Various typo fixes in docs, docstrings, comments, etc...
> 
> Signed-off-by: Pieter Praet 

Thanks for these fixes, Pieter!

I've pushed these all out now. I split the original commit up into 6
commits that each touch different kinds of text, (non-code text files,
comments within source files, error messages within source files, etc.)

The idea there is that these different kinds of text have different
potential impacts on the correctness of the code. So some release
manager might be willing to include one kind of change, but not another,
for example.

Also, it made things a bit easier to read. There were two incorrect typo
fixes in the original commit which I fixed:

> -"\tSeveral notmuch commands accept a comman syntax for search\n"
> +"\tSeveral notmuch commands accept a command syntax for search\n"

This is now "common syntax".

> -# Remember stdout and stderr file descriptios and redirect test
> +# Remember stdout and stderr file descriptions and redirect test

This is now "file descriptors".

And one change where I left the original text unchanged:

>   * A non-NULL return value is guaranteed to be a valid string pointer
>   * pointing to the characters "new/" or "cur/", (but not
> - * NUL-terminated).
> + * NULL-terminated).

This comment uses "NULL" to describe a NULL pointer and "NUL" to
describe the ASCII character '\0'. (I know that "NUL" is a really
annoying historically misspelled abbreviation, but it is in standard
usage I believe---see ASCII(7) for example.)

Meanwhile, I was almost tempted to leave this misspelling unchanged:

> -  (error "%s is a file. Can't creat maildir." path))
> +  (error "%s is a file. Can't create maildir." path))

Since that's also a classic historically misspelled abbreviation. ;-)

Oh, and let me just thank you for being so thorough! There were several
fixes you made that could obviously not be caught by an automated spell
checker:

> ---part=id", (David Edmonson wants to rewrite some of "notmuch show" to
> +--part=id", (David Edmondson wants to rewrite some of "notmuch show" to
...
>  (defun notmuch-user-other-email ()
> -  "Return the user.primary_email value (as a list) from the notmuch 
> configuration."
> +  "Return the user.other_email value (as a list) from the notmuch 
> configuration."
...
>  (defcustom notmuch-after-tag-hook nil
> -  "Hooks that are run before tags of a message are modified.
> +  "Hooks that are run after tags of a message are modified.
...
> -The debian packaging exists in the top-level "debian" directory within
> +The Debian packaging exists in the top-level "debian" directory within

Those all demonstrate a particular eye for detail?well done! For a
couple of those, I almost gave them their own commits.

In passing, let me point out the most amusing typo I saw in the patch:

> -} /* Appleasing Emacs */
> +} /* Appeasing Emacs */

I almost hate to see that go, because I like the pleasing portmanteau
sound of "appleasing". Please applease me and leave this pleasing typo?

Admittedly, that's not in code that's originally mine, so I can't say it
wasn't intentional either.

Finally, *many* of the typos and misspellings were originally mine. It's
certainly embarrassing to see so many (and so many repeats). It was also
embarrassing to see how many misspellings I committed while typing the
commit messages, (fortunately I rebased many away).

And now I'm starting to get paranoid about this message. Am I really
brave enough to type words like "embarrassing", "misspelling", and
"committed" here?

Thanks again,

-Carl
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/2e40e305/attachment-0001.pgp>


[PATCH] tests: add a test for symbol hiding side effects

2011-06-23 Thread Carl Worth
On Thu, 23 Jun 2011 07:24:08 -0300, David Bremner  wrote:
> On Wed, 22 Jun 2011 09:02:36 -0300, david at tethera.net wrote:
> > From: David Bremner 
> > 
> > The worry here is that a binary linking with libnotmuch might lose
> > access to Xapian::Error symbols because libnotmuch hides them.
> 
> After some helpful feedback from jrollins and amdragon on IRC, I have
> pushed an updated version of this. The guts of the updated test are as
> follows:

Lovely stuff! I so love having new features come along with their own tests.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/f26d66fd/attachment.pgp>


Debian packaging changes

2011-06-23 Thread Carl Worth
On Tue, 21 Jun 2011 10:26:43 -0300, David Bremner  wrote:
> As of the latest snapshot for debian experimental, I create seperate
> binary packages for python bindings and for the emacs-interface. Since
> the plan is to merge these changes back to master fairly soon, I'd
> appreciate any feedback on these or any other patches in the series.

All look fine to me. Thanks for pushing these.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/83d4f5dd/attachment.pgp>


[PATCH 2/2] Do not import notmuch in setup.py.

2011-06-23 Thread Carl Worth
On Mon, 20 Jun 2011 09:47:56 +0200, Sebastian Spaeth  
wrote:
> The debian/control part, I would prefer it some maintainer would nod
> off/merge that one.

Fortunately, that's David himself, now. :-)

This seems to all be pushed now.

David, it would help me if you would send a note to the list when you've
merged a patch series such as this one.

Thanks,

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/045ca365/attachment.pgp>


[PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.

2011-06-23 Thread Carl Worth
On Sat, 04 Jun 2011 00:22:04 +0400, Dmitry Kurochkin  wrote:
> On Fri, 03 Jun 2011 13:05:00 -0700, Carl Worth  wrote:
> > > I do not think we need a test for this fix.  What we need are tests for
> > > FCC functionality when notmuch-fcc-dirs is a list.
> > 
> > Yes!

I've written these now. And they do test this fix. What they show is
that a legitimate setting (of notmuch-fcc-dirs as a list) was resulting
in an error rather than working. That's a nasty little bug, (and poor
coverage from our test suite before.

>   Fix wrong-type-argument lisp error in `notmuch-fcc-header-setup' when
>   `notmuch-fcc-dirs' is set to a list.  The error was in the
>   `notmuch-fcc-dirs' format check which was changed in an incompatible
>   way from 0.4 to 0.5.

Thanks for the fixed wording. I've now pushed out the fix (along with
the tests).

With all the talk of "old style" vs. "new style" I was thinking that the
bug only affected people with the old-style FCC setting. The bug is much
worse than that, (preventing people from using the new list-based
style).

Anyway, thanks for the patch, Dmitry. And thanks for pushing me to take
another look.

David, I suggest including this fix (and its test) in the release
branch.

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/576639ad/attachment.pgp>


debian: Override RPATH_LDFLAGS

2011-06-23 Thread Carl Worth
On Wed, 22 Jun 2011 18:48:34 -0700 (PDT), (David Bremner) wrote:
> Probably there is a nicer way to do this; perhaps it should be a
> configure option.
> (cherry picked from commit 387dc520dd68cc805e390f3a1399f85b5d5bd83a)

This nicer way involved automatic detection of when rpath is
needed. That was the intent always, but it was broken for a while,
(leading to this patch I believe).

The automatic detection should actually be working now. See the commit
referenced below.

So, you'll want to test it, of course, but I think you can (and should)
drop this override of RPATH_LDFLAGS from the Debian packaging now.

-Carl

commit 574f408816e636f677b14384c18cc2e388991411
Author: Carl Worth 
Date:   Wed Jun 1 13:02:58 2011 -0700

configure: Fix detection of libdir in ldconfig configuration

Ever since commit b4b5e9ce4dac62111ec11da6d22b7e618056801f the
detection of libdir in the ldconfig configuration has been broken,
resulting in RPATH being set when not needed and not wanted.

The cause was a change from an IFS setting of:

IFS="$(printf '\n\t')"

to a new setting of:

IFS="$(printf '\n')"

That looks desirable since we want to split the output of ldconfig
based on newlines, (and not split on any filename that might have an
embedded tab in it). The subtle bug in the above is that the shell
trims any trailing newlines when performing command substitution so
the final statement above was equivalent to:

IFS=''

which prevented any splitting of the ldconfig output at all.

Fix this by avoiding command substitution and just using a literal
newline in the source file for setting this variable.
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/c04a5eae/attachment.pgp>


libnotmuch: add linker script to declare only notmuch_* symbols as global.

2011-06-23 Thread Carl Worth
On Thu, 23 Jun 2011 03:20:05 -0700 (PDT), (David Bremner) wrote:
> This is closely tied to gcc and particularly gnu ld, but I guess the
> shared library linking code would need to be adjusted to work on a
> non-gnu linker anyay.

This looks like a great change, David. Thanks!

Presumably you'll be updating the debian/libnotmuch1.symbols files as
necessary next. (I assume the packaging scripts will guide you to do
that anyway.)

-Carl

-- 
carl.d.worth at intel.com
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/e6733e88/attachment.pgp>


Notmuch 0.6: Let's do it.

2011-06-23 Thread Sebastian Spaeth
On Wed, 22 Jun 2011 22:26:06 -0300, David Bremner wrote:
> No, it's not a code name, unless you really want it to be. After some
> discussion with Carl and Jamie on IRC, I have declared myself release
> tyrant, with Jamie as my assistant [1].

Me bows to the tyrant and the hard-working henchmen. :)

Congrats and thanks
Sebastian
-- next part --
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: 
<http://notmuchmail.org/pipermail/notmuch/attachments/20110623/435caa50/attachment-0001.pgp>


[PATCH] tests: add a test for symbol hiding side effects

2011-06-23 Thread David Bremner
On Wed, 22 Jun 2011 09:02:36 -0300, david at tethera.net wrote:
> From: David Bremner 
> 
> The worry here is that a binary linking with libnotmuch might lose
> access to Xapian::Error symbols because libnotmuch hides them.

After some helpful feedback from jrollins and amdragon on IRC, I have
pushed an updated version of this. The guts of the updated test are as
follows:

run_test(){
result=$(LD_LIBRARY_PATH=../../lib ./symbol-test 2>&1)
}

output="A Xapian exception occurred opening database: Couldn't stat 
'fakedb/.notmuch/xapian'
caught No chert database found at path \`./nonexistant'"

g++ -o symbol-test -I../../lib ../symbol-test.cc -L../../lib -lnotmuch -lxapian
mkdir -p fakedb/.notmuch
test_expect_success 'running test' run_test
test_begin_subtest 'checking output'
test_expect_equal "$result" "$output" 
test_done


Re: Notmuch 0.6: Let's do it.

2011-06-23 Thread Sebastian Spaeth
On Wed, 22 Jun 2011 22:26:06 -0300, David Bremner wrote:
 No, it's not a code name, unless you really want it to be. After some
 discussion with Carl and Jamie on IRC, I have declared myself release
 tyrant, with Jamie as my assistant [1].

Me bows to the tyrant and the hard-working henchmen. :)

Congrats and thanks
Sebastian


pgpHPE299KnNT.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: Notmuch 0.6: Let's do it.

2011-06-23 Thread Jameson Graef Rollins
On Thu, 23 Jun 2011 09:13:05 +0200, Sebastian Spaeth sebast...@sspaeth.de 
wrote:
 Me bows to the tyrant and the hard-working henchmen. :)

We (henchmen) generally prefer to go by the official title of
Interim Distinguished co-Chief Vice Tyrant.

jamie.


pgp6gQsY9ndfp.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] tests: add a test for symbol hiding side effects

2011-06-23 Thread David Bremner
On Wed, 22 Jun 2011 09:02:36 -0300, da...@tethera.net wrote:
 From: David Bremner brem...@debian.org
 
 The worry here is that a binary linking with libnotmuch might lose
 access to Xapian::Error symbols because libnotmuch hides them.

After some helpful feedback from jrollins and amdragon on IRC, I have
pushed an updated version of this. The guts of the updated test are as
follows:

run_test(){
result=$(LD_LIBRARY_PATH=../../lib ./symbol-test 21)
}

output=A Xapian exception occurred opening database: Couldn't stat 
'fakedb/.notmuch/xapian'
caught No chert database found at path \`./nonexistant'

g++ -o symbol-test -I../../lib ../symbol-test.cc -L../../lib -lnotmuch -lxapian
mkdir -p fakedb/.notmuch
test_expect_success 'running test' run_test
test_begin_subtest 'checking output'
test_expect_equal $result $output 
test_done
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH 2/2] Do not import notmuch in setup.py.

2011-06-23 Thread Carl Worth
On Mon, 20 Jun 2011 09:47:56 +0200, Sebastian Spaeth sebast...@sspaeth.de 
wrote:
 The debian/control part, I would prefer it some maintainer would nod
 off/merge that one.

Fortunately, that's David himself, now. :-)

This seems to all be pushed now.

David, it would help me if you would send a note to the list when you've
merged a patch series such as this one.

Thanks,

-Carl

-- 
carl.d.wo...@intel.com


pgpCONK1sXKuP.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: Debian packaging changes

2011-06-23 Thread Carl Worth
On Tue, 21 Jun 2011 10:26:43 -0300, David Bremner brem...@debian.org wrote:
 As of the latest snapshot for debian experimental, I create seperate
 binary packages for python bindings and for the emacs-interface. Since
 the plan is to merge these changes back to master fairly soon, I'd
 appreciate any feedback on these or any other patches in the series.

All look fine to me. Thanks for pushing these.

-Carl

-- 
carl.d.wo...@intel.com


pgpYdyJ0inFER.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] tests: add a test for symbol hiding side effects

2011-06-23 Thread Carl Worth
On Thu, 23 Jun 2011 07:24:08 -0300, David Bremner da...@tethera.net wrote:
 On Wed, 22 Jun 2011 09:02:36 -0300, da...@tethera.net wrote:
  From: David Bremner brem...@debian.org
  
  The worry here is that a binary linking with libnotmuch might lose
  access to Xapian::Error symbols because libnotmuch hides them.
 
 After some helpful feedback from jrollins and amdragon on IRC, I have
 pushed an updated version of this. The guts of the updated test are as
 follows:

Lovely stuff! I so love having new features come along with their own tests.

-Carl

-- 
carl.d.wo...@intel.com


pgpjyD9oemH4w.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.

2011-06-23 Thread Dmitry Kurochkin
On Thu, 23 Jun 2011 15:22:46 -0700, Carl Worth cwo...@cworth.org wrote:
 On Sat, 04 Jun 2011 00:22:04 +0400, Dmitry Kurochkin 
 dmitry.kuroch...@gmail.com wrote:
  On Fri, 03 Jun 2011 13:05:00 -0700, Carl Worth cwo...@cworth.org wrote:
I do not think we need a test for this fix.  What we need are tests for
FCC functionality when notmuch-fcc-dirs is a list.
   
   Yes!
 
 I've written these now. And they do test this fix. What they show is
 that a legitimate setting (of notmuch-fcc-dirs as a list) was resulting
 in an error rather than working. That's a nasty little bug, (and poor
 coverage from our test suite before.
 
Fix wrong-type-argument lisp error in `notmuch-fcc-header-setup' when
`notmuch-fcc-dirs' is set to a list.  The error was in the
`notmuch-fcc-dirs' format check which was changed in an incompatible
way from 0.4 to 0.5.
 
 Thanks for the fixed wording. I've now pushed out the fix (along with
 the tests).
 
 With all the talk of old style vs. new style I was thinking that the
 bug only affected people with the old-style FCC setting. The bug is much
 worse than that, (preventing people from using the new list-based
 style).
 
 Anyway, thanks for the patch, Dmitry. And thanks for pushing me to take
 another look.
 

Well, I should have prepared a better commit message from the
beginning.  Then no pushing might have been needed :)

Regards,
  Dmitry

 David, I suggest including this fix (and its test) in the release
 branch.
 
 -Carl
 
 -- 
 carl.d.wo...@intel.com
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] fix sum moar typos

2011-06-23 Thread Carl Worth
On Mon, 20 Jun 2011 22:14:21 +0200, Pieter Praet pie...@praet.org wrote:
 Various typo fixes in docs, docstrings, comments, etc...
 
 Signed-off-by: Pieter Praet pie...@praet.org

Thanks for these fixes, Pieter!

I've pushed these all out now. I split the original commit up into 6
commits that each touch different kinds of text, (non-code text files,
comments within source files, error messages within source files, etc.)

The idea there is that these different kinds of text have different
potential impacts on the correctness of the code. So some release
manager might be willing to include one kind of change, but not another,
for example.

Also, it made things a bit easier to read. There were two incorrect typo
fixes in the original commit which I fixed:

 -\tSeveral notmuch commands accept a comman syntax for search\n
 +\tSeveral notmuch commands accept a command syntax for search\n

This is now common syntax.

 -# Remember stdout and stderr file descriptios and redirect test
 +# Remember stdout and stderr file descriptions and redirect test

This is now file descriptors.

And one change where I left the original text unchanged:

   * A non-NULL return value is guaranteed to be a valid string pointer
   * pointing to the characters new/ or cur/, (but not
 - * NUL-terminated).
 + * NULL-terminated).

This comment uses NULL to describe a NULL pointer and NUL to
describe the ASCII character '\0'. (I know that NUL is a really
annoying historically misspelled abbreviation, but it is in standard
usage I believe---see ASCII(7) for example.)

Meanwhile, I was almost tempted to leave this misspelling unchanged:

 -  (error %s is a file. Can't creat maildir. path))
 +  (error %s is a file. Can't create maildir. path))

Since that's also a classic historically misspelled abbreviation. ;-)

Oh, and let me just thank you for being so thorough! There were several
fixes you made that could obviously not be caught by an automated spell
checker:

 ---part=id, (David Edmonson wants to rewrite some of notmuch show to
 +--part=id, (David Edmondson wants to rewrite some of notmuch show to
...
  (defun notmuch-user-other-email ()
 -  Return the user.primary_email value (as a list) from the notmuch 
 configuration.
 +  Return the user.other_email value (as a list) from the notmuch 
 configuration.
...
  (defcustom notmuch-after-tag-hook nil
 -  Hooks that are run before tags of a message are modified.
 +  Hooks that are run after tags of a message are modified.
...
 -The debian packaging exists in the top-level debian directory within
 +The Debian packaging exists in the top-level debian directory within

Those all demonstrate a particular eye for detail—well done! For a
couple of those, I almost gave them their own commits.

In passing, let me point out the most amusing typo I saw in the patch:

 -} /* Appleasing Emacs */
 +} /* Appeasing Emacs */

I almost hate to see that go, because I like the pleasing portmanteau
sound of appleasing. Please applease me and leave this pleasing typo?

Admittedly, that's not in code that's originally mine, so I can't say it
wasn't intentional either.

Finally, *many* of the typos and misspellings were originally mine. It's
certainly embarrassing to see so many (and so many repeats). It was also
embarrassing to see how many misspellings I committed while typing the
commit messages, (fortunately I rebased many away).

And now I'm starting to get paranoid about this message. Am I really
brave enough to type words like embarrassing, misspelling, and
committed here?

Thanks again,

-Carl


pgpr7oDhzHpxZ.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH 14/25] Fix old style notmuch-fcc-dirs configuration check.

2011-06-23 Thread Carl Worth
On Fri, 24 Jun 2011 02:58:23 +0400, Dmitry Kurochkin 
dmitry.kuroch...@gmail.com wrote:
 Well, I should have prepared a better commit message from the
 beginning.  Then no pushing might have been needed :)

That, or a test case, (which would have clued me in to read the correct
interpretation of the original commit message).

Regardless, the fix is in place now, and that's what matters.

Thanks again,

-Carl

-- 
carl.d.wo...@intel.com


pgp7PyXXkFyaS.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] fixed typo in a comment

2011-06-23 Thread Carl Worth
On Sun, 29 May 2011 01:56:49 -0700, notm...@dima.secretsauce.net wrote:
 From: Dima Kogan d...@secretsauce.net
 
  This patch corrects a typo

Thanks for the patch, Dima!

This is now fixed.

-Carl

-- 
carl.d.wo...@intel.com


pgp2qzhQfV4ev.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: libnotmuch: add linker script to declare only notmuch_* symbols as global.

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 14:35:58 -0700, Carl Worth cwo...@cworth.org wrote:
 On Thu, 23 Jun 2011 03:20:05 -0700 (PDT), (David Bremner) wrote:
 Presumably you'll be updating the debian/libnotmuch1.symbols files as
 necessary next. (I assume the packaging scripts will guide you to do
 that anyway.)

Yes, this is now pushed, in 19f0ca7

d


pgp3zj2VZDN0P.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


[PATCH] test: remove useless test_emacs call from an emacs FCC test

2011-06-23 Thread Dmitry Kurochkin
---
 test/emacs |1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/test/emacs b/test/emacs
index 9b5d485..6f82b08 100755
--- a/test/emacs
+++ b/test/emacs
@@ -124,7 +124,6 @@ mkdir -p mail/sent-string/new
 mkdir -p mail/sent-string/tmp
 
 test_begin_subtest notmuch-fcc-dirs set to a string
-test_emacs (setq notmuch-fcc-dirs nil) (notmuch-mua-mail) (princ 
(buffer-string))  OUTPUT
 test_emacs (setq notmuch-fcc-dirs \sent-string\) (notmuch-mua-mail) (princ 
(buffer-string))  OUTPUT
 cat EOF EXPECTED
 From: Notmuch Test Suite test_su...@notmuchmail.org
-- 
1.7.5.4

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] Add dir-locals style variables for C++, Elisp, and shell code.

2011-06-23 Thread Carl Worth
On Thu,  9 Jun 2011 21:28:51 -0400, Austin Clements amdra...@mit.edu wrote:
 Also, slightly reformat dir-locals.el so that the settings align and
 to make it friendlier for future additions.

Thanks. Pushed.

-Carl

-- 
carl.d.wo...@intel.com


pgprBCITDA5OY.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] test: remove useless test_emacs call from an emacs FCC test

2011-06-23 Thread Carl Worth
On Fri, 24 Jun 2011 03:59:33 +0400, Dmitry Kurochkin 
dmitry.kuroch...@gmail.com wrote:
 ---
  test/emacs |1 -
  1 files changed, 0 insertions(+), 1 deletions(-)

Thanks for the catch. That was left over from some debugging I was doing
while writing the patch originally.

All fixed.

-Carl

-- 
carl.d.wo...@intel.com


pgppi9FO2JitG.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: debian: Override RPATH_LDFLAGS

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 14:38:42 -0700, Carl Worth cwo...@cworth.org wrote:
 
 So, you'll want to test it, of course, but I think you can (and should)
 drop this override of RPATH_LDFLAGS from the Debian packaging now.

As you say, it seems to work without this patch. Revert pushed to
master.

d

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] test: remove useless test_emacs call from an emacs FCC test

2011-06-23 Thread David Bremner
On Thu, 23 Jun 2011 17:12:04 -0700, Carl Worth cwo...@cworth.org wrote:
 
 Thanks for the catch. That was left over from some debugging I was doing
 while writing the patch originally.

I cherry-picked all three of these into the release branch.  I'm going
to skip the typo fixes for 0.6, unless convinced otherwise.

d

P.S. It would be great if people built the release branch and reported
any (new) problems.


pgpzEOdptcEU8.pgp
Description: PGP signature
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch