notmuch, branch 0.6rc1

debian: changelog stanza for first "official" release candidate

2011-06-30T13:09:00Z

The last upload to experimental was really a release candidate too. Switch versioning to ~rc1 as counting commits is confusing when building from the release branch. (cherry picked from commit 117852a5f1269e77a7f76c53236220a9ec89eba6)

debian: don't install zsh completion files into /usr/share/zsh

2011-06-30T12:33:34Z

as of version 4.3.12, perhaps earlier, the Debian zsh package now ships /usr/share/zsh/functions/Completion/Unix/_notmuch, so we shouldn't install that ourselves anymore. My understanding is that letting zsh ship the completion scripts is the standard thing to do. The script is still shipped in /usr/share/doc/notmuch/examples (cherry picked from commit 0a0f5f1bbe4bf256a14dee0ab2af3065a251a72c)

python: Do not implicitely call maildir_flags_to_tags etc

2011-06-30T10:26:16Z

In order to remain consistent with the underlying C API, we do not automatically synchronize notmuch tags and maildir flags anymore. The underlying functions Message.maildir_flags_to_tags and Message.tags_to_maildir_flags still exist and are available to the user. Signed-off-by: Sebastian Spaeth (cherry picked from commit e59eaa5ddd2c23742c95e2acd34673b58ea34d2d)

debian/changelog: Add note that notmuch-vim description is in (bug #631974)

2011-06-30T01:02:58Z

This note will automatically cause the bug entry to be closed as fixed when the next package (including this change) is uploaded. (cherry picked from commit 04b9ffa56f54976f6a3324a3673915a036646ea6)

Fix folder: coherence issue

2011-06-30T00:58:53Z

Add removal of all ZXFOLDER terms to removal of all XFOLDER terms for each message filename removal. The existing filename-list reindexing will put all the needed terms back in. Test search-folder-coherence now passes. Signed-off-by:Mark Anderson (cherry picked from commit 8a856e5c38b79359e4fbf9e27f58b1fe00c1e18a)

test: Use increment_mtime rather than sleep

2011-06-30T00:58:39Z

The sleep was to force the directory's mtime to advance between the previous notmuch new and the subsequent rm;notmuch new. The current convention is to use the existing increment_mtime function for this purpose, (which avoids the test suite being slowed down by calls to sleep). Thanks to Austin Clements for noticing this undesired sleep. (cherry picked from commit 55a78d5dbd96b80939458d9d6cc8a536b1befa87)

test:Folder tags shouldn't match after removal of file in given folder

2011-06-30T00:58:19Z

Test for bug. Current stemming support for notmuch adds extra terms to the DB which aren't removed when the file renames are detected. When folder tags are added to a message, Xapian terms for both XFOLDER and ZXFOLDER are generated. When one of the filenames are renamed/removed, only the XFOLDER tags are removed, leaving it possible for a match on a folder: tag that was previously but is no longer a match in the maildir. (cherry picked from commit 86e0baeb6df5509393832488c0de3520a1a5bdcb)

search --output=files: Output all filenames for each matching message

2011-06-30T00:56:57Z

Messages in the database can have multiple files associated with a single message-id, but until now only one filename for each message has been reported by "notmuch search --output=files" Signed-off-by: Mark Anderson (cherry picked from commit d752509abfd7697d2f8a1c5be6f96f0df4f0299d)

libnotmuch: build symbols list without relying on gcc -aux-info.

2011-06-28T19:32:07Z

Carl reports "gcc -aux-info notmuch.aux lib/notmuch.h" does not generate notmuch.aux for him with Debian gcc 4.6.0-8. A small modification of the original sed regular expression allows us to work directly from lib/notmuch.h, rather than preprocessing with gcc. As with most such simple regex based "parsing", this is quite sensitive to the input format, and needs that each symbol to be exported from libnotmuch should - start with "notmuch_" - be the first non-whitespace token on the line - be followed by an open parenthesis. (Cherry-picked from 51b7ab69687, with conflicts resolved by db)

test: remove useless test_emacs call from an emacs FCC test

2011-06-24T01:01:35Z

This was inadvertently left over when debugging an early version of this commit. -Carl Worth (cherry picked from commit 8bf0c1c3deb49d54e86c04826a05f0217a81cf47)