]> git.notmuchmail.org Git - notmuch/log
13 years agoFix invalid face reference.
Kan-Ru Chen [Sun, 22 Nov 2009 06:40:59 +0000 (14:40 +0800)]
Fix invalid face reference.

To avoid the "Invalid face reference: cons [18 times]" kind of message
goes on and on in the *Messages*.

Signed-off-by: Kan-Ru Chen <kanru@kanru.info>
13 years agonotmuch-new: Only print the regular progress report when on a tty
Chris Wilson [Sun, 22 Nov 2009 00:44:32 +0000 (00:44 +0000)]
notmuch-new: Only print the regular progress report when on a tty

Check that the stdout is connected to an interactive terminal with
isatty() before installing the periodic timer to print progress reports.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
13 years agonotmuch-new: Only install SIGALRM if not running under gdb
Chris Wilson [Sun, 22 Nov 2009 00:44:31 +0000 (00:44 +0000)]
notmuch-new: Only install SIGALRM if not running under gdb

I felt sorry for Carl trying to step through an exception from xapian
and suffering from the SIGALARMs..

We can detect if the user launched notmuch under a debugger by either
checking our cmdline for the presence of the gdb string or querying if
valgrind is controlling our process. For the latter we need to add a
compile time check for the valgrind development library, and so add the
initial support to build Makefile.config from configure.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Carl Worth <cworth@cworth.org>
[ickle: And do not install the timer when under the debugger]

13 years agolib/database.cc: coding style
Chris Wilson [Sat, 21 Nov 2009 23:14:39 +0000 (23:14 +0000)]
lib/database.cc: coding style

Carl claims he must have been distracted when he wrote this...

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
13 years agoMakefile: Fix to work even with GZIP environment variable set.
Carl Worth [Sun, 22 Nov 2009 03:45:16 +0000 (04:45 +0100)]
Makefile: Fix to work even with GZIP environment variable set.

The rule here was written to assume that if the GZIP environment
variable was set that it would be the gzip binary to execute,
(similar to the CC and CXX variables). But GZIP is actually used
to pass arguments to gzip, so we have to use a different name.

13 years agoMakefile: Magic silent rules.
Chris Wilson [Sat, 21 Nov 2009 20:32:20 +0000 (20:32 +0000)]
Makefile: Magic silent rules.

Use the facilities of GNU make to create a magic function that will
on the first invocation print a description of how to enable verbose
compile lines and then print the quiet rule.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Carl Worth <cworth@cworth.org>
Cc: Mikhail Gusarov <dottedmag@dottedmag.net>
[ickle: Rebased, and duplicate command string eliminated.]
[ickle: Fixed verbose bug pointed out by Mikhail]

13 years agoadd_message: Use sha-1 in place of overly long message ID.
Carl Worth [Sun, 22 Nov 2009 03:03:49 +0000 (04:03 +0100)]
add_message: Use sha-1 in place of overly long message ID.

Since Xapian has a limit on the maximum length of a term, we have
to check for that before trying to add the message ID as a term.

This fixes the bug reported by Mike Hommey here:


I've also constructed 20 files with a range of message ID lengths
centered around the Xapian term-length limit which I'll use to seed a
new test suite soon.

13 years agoget_timestamp: Ensure that return value is 0 in case of exception.
Carl Worth [Sun, 22 Nov 2009 02:55:39 +0000 (03:55 +0100)]
get_timestamp: Ensure that return value is 0 in case of exception.

Just to be on the safe side of things.

13 years agoCatch and optionally print about exception at database->flush.
Carl Worth [Sun, 22 Nov 2009 02:54:20 +0000 (03:54 +0100)]
Catch and optionally print about exception at database->flush.

If an earlier exception occurred, then it's not unexpected for the
flush to fail as well. So in that case, we'll silently catch the
exception. Otherwise, make some noise about things going wrong at the
time of flush.

13 years agoAdd a missing print after catching an exception.
Carl Worth [Sun, 22 Nov 2009 02:52:55 +0000 (03:52 +0100)]
Add a missing print after catching an exception.

Without this, trying to debug this exception was *really* confusing.

13 years agoPrint information about where Xapian exception occurred.
Carl Worth [Sun, 22 Nov 2009 02:41:30 +0000 (03:41 +0100)]
Print information about where Xapian exception occurred.

Previously, our Xapian exception reports where identical so they
were hard to track down.

13 years agonotmuch-config: Fix memleaks.
Holger Freyther [Sat, 21 Nov 2009 21:45:23 +0000 (22:45 +0100)]
notmuch-config: Fix memleaks.

While talloc is great we need to free the g_error by hand.

Tested-by: Stefan Schmidt <stefan@datenfreihafen.org>
Signed-off-by: Holger Freyther <zecke@selfish.org>
13 years agonotmuch new: Fix to actually open the database READ_WRITE.
Chris Wilson [Sat, 21 Nov 2009 23:13:24 +0000 (00:13 +0100)]
notmuch new: Fix to actually open the database READ_WRITE.

Chris claims he must have been distracted when he wrote this.

13 years agoFix freak case problem that broke the compile.
Carl Worth [Sat, 21 Nov 2009 21:29:31 +0000 (22:29 +0100)]
Fix freak case problem that broke the compile.

I think I must have bumped some emacs keybinding that changed the case
of a word here.

Carl Worth [Sat, 21 Nov 2009 21:10:18 +0000 (22:10 +0100)]

And correspondingly, READONLY to READ_ONLY.

13 years agoPermit opening the notmuch database in read-only mode.
Chris Wilson [Sat, 21 Nov 2009 19:54:25 +0000 (19:54 +0000)]
Permit opening the notmuch database in read-only mode.

We only rarely need to actually open the database for writing, but we
always create a Xapian::WritableDatabase. This has the effect of
preventing searches and like whilst updating the index.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Carl Worth <cworth@cworth.org>
13 years agoINSTALL/notmuch.el: More details on how to install/run notmuch.el
Carl Worth [Sat, 21 Nov 2009 20:40:57 +0000 (21:40 +0100)]
INSTALL/notmuch.el: More details on how to install/run notmuch.el

Hopefully this will save some people some head-scratching trying
to figure out how to use it.

13 years agoINSTALL: emacs install dokumentation.
Stefan Schmidt [Sat, 21 Nov 2009 19:36:06 +0000 (20:36 +0100)]
INSTALL: emacs install dokumentation.

Write down the steps needed to install and actuall use notmuch in emacs. Should
help emacs newbies.

Signed-off-by: Stefan Schmidt <stefan@datenfreihafen.org>
13 years agoRevert "notmuch: Add Maildir directory name as tag name for messages"
Carl Worth [Sat, 21 Nov 2009 20:21:58 +0000 (21:21 +0100)]
Revert "notmuch: Add Maildir directory name as tag name for messages"

This reverts commit 9794f19017e028b542ed715bef3fd7cf0da5edff.

The feature makes a lot of sense for the initial import, but it's not
as clear whether it makes sense for ongoing "notmuch new" runs. We
might need to make this opt-in by configuration.

13 years agoTODO: Add notes on portability, and remove completed tasks.
Carl Worth [Sat, 21 Nov 2009 18:54:24 +0000 (19:54 +0100)]
TODO: Add notes on portability, and remove completed tasks.

It's better to have things in TODO rather than mails with a todo
tag in my notmuch database.

13 years agoTODO: Several updates.
Carl Worth [Sat, 21 Nov 2009 18:52:43 +0000 (19:52 +0100)]
TODO: Several updates.

13 years agoINSTALL: Mention that xapian-config might be named xapian-config-1.1
Carl Worth [Sat, 21 Nov 2009 18:52:06 +0000 (19:52 +0100)]
INSTALL: Mention that xapian-config might be named xapian-config-1.1

As reported on the mailing list.

13 years agonotmuch: Add Maildir directory name as tag name for messages
Aneesh Kumar K.V [Wed, 18 Nov 2009 15:50:12 +0000 (21:20 +0530)]
notmuch: Add Maildir directory name as tag name for messages

This patch adds maildir directory name as the tag name for
messages. This helps in adding tags using filtering already
provided by procmail.

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
13 years agoMakefile: Fix the fallback emacs install path.
Carl Worth [Sat, 21 Nov 2009 10:38:27 +0000 (11:38 +0100)]
Makefile: Fix the fallback emacs install path.

When pkg-config can't be used to find out where to install emacs
files, we fallback to a hard-coded directory. Only, we were falling
back to the wrong thing, (one that emacs doesn't look into by

13 years agoDrop redundant CFLAGS, was already included in CXXFLAGS
Jed Brown [Fri, 20 Nov 2009 15:58:15 +0000 (16:58 +0100)]
Drop redundant CFLAGS, was already included in CXXFLAGS

13 years agonotmuch reply: Include text parts in reply, even with disposition attachment.
Carl Worth [Sat, 21 Nov 2009 00:14:01 +0000 (01:14 +0100)]
notmuch reply: Include text parts in reply, even with disposition attachment.

If it's text, (such as a patch), then I want it quoted in my reply,
(so that I can comment on it).

13 years agonotmuch show: Don't hide text parts, even with disposition attachment.
Carl Worth [Sat, 21 Nov 2009 00:09:36 +0000 (01:09 +0100)]
notmuch show: Don't hide text parts, even with disposition attachment.

If it's text, (such as a patch), then I want to see it.

13 years agonotmuch show: Don't hide a digital signature.
Carl Worth [Sat, 21 Nov 2009 00:00:41 +0000 (01:00 +0100)]
notmuch show: Don't hide a digital signature.

This was a bug that was introduced in copying the indexing code over
into notmuch-show.c. When indexing, we want to ignore the signature,
(it has no interesting terms). But when presenting the message, it's
important to present the signature to the user.

(And would be even better if we presented whether or not the signature
is good.)

13 years agonotmuch.el: Don't use end-of-buffer which is inappropriate from programs
Carl Worth [Fri, 20 Nov 2009 23:58:16 +0000 (00:58 +0100)]
notmuch.el: Don't use end-of-buffer which is inappropriate from programs

The documentation is quite clear about this case.

With this, we can now byte compile without warnings.

13 years agonotmuch.el: Fix stale reference to non-existing variable.
Carl Worth [Fri, 20 Nov 2009 23:53:27 +0000 (00:53 +0100)]
notmuch.el: Fix stale reference to non-existing variable.

We changed from "query" to "thread-id" a while ago, and broke this
error message at the time. Fix it now.

13 years agonotmuch.el: Add many missing defvar calls.
Carl Worth [Fri, 20 Nov 2009 23:52:23 +0000 (00:52 +0100)]
notmuch.el: Add many missing defvar calls.

Without these, emacs was complaining about "assignment to free variable",
(though only when byte compiling, which is why we didn't notice earlier).

13 years agoWhen a search query triggers a Xapian exception, log what the query was.
Eric Anholt [Fri, 20 Nov 2009 13:00:42 +0000 (14:00 +0100)]
When a search query triggers a Xapian exception, log what the query was.

In my script containing a series of queries to be run on new mail for
setting up tags, it's nice to see which query I typed wrong.

Signed-off-by: Eric Anholt <eric@anholt.net>
13 years agoMake bash completion directory configurable.
James Rowe [Fri, 20 Nov 2009 15:28:26 +0000 (15:28 +0000)]
Make bash completion directory configurable.

Some systems install completion scripts in /usr/share/bash-completion, make the
location configurable from Makefile.config.

13 years agoadd_message: Re-fix handling of non-mail files.
Carl Worth [Fri, 20 Nov 2009 20:46:37 +0000 (21:46 +0100)]
add_message: Re-fix handling of non-mail files.

More fallout from _get_header now returning "" for missing headers.

The bug here is that we would no longer detect that a file is not an
email message and give up on it like we should.

And this time, I actually audited all callers to
notmuch_message_get_header, so hopefully we're done fixing this
bug over and over.

13 years agonotmuch_database_add_message: Add missing error-value propagation.
Carl Worth [Fri, 20 Nov 2009 20:02:11 +0000 (21:02 +0100)]
notmuch_database_add_message: Add missing error-value propagation.

Thanks to Mike Hommey for doing the analysis that led to noticing that
this was missing.

13 years agoadd_message: Properly handle missing Message-ID once again.
Carl Worth [Fri, 20 Nov 2009 18:31:00 +0000 (19:31 +0100)]
add_message: Properly handle missing Message-ID once again.

There's been a fair amount of fallout from when we changed
message_file_get_header from returning NULL to returning "" for
missing headers. This is yet more fallout from that, (where we were
accepting an empty message-ID rather than generating one like we want

13 years agoCheckin some command-only tcsh completions
Alexander Botero-Lowry [Thu, 19 Nov 2009 01:15:43 +0000 (17:15 -0800)]
Checkin some command-only tcsh completions

Modified-by Carl Worth <cworth@cworth.org>: Just moved the file down
into contrib where the other completion scripts are.

13 years agobash-completion: Move to contrib
Ingmar Vanhassel [Fri, 20 Nov 2009 13:36:14 +0000 (14:36 +0100)]
bash-completion: Move to contrib

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
13 years agozsh-completion: Initial zsh-completion for notmuch
Ingmar Vanhassel [Fri, 20 Nov 2009 13:36:13 +0000 (14:36 +0100)]
zsh-completion: Initial zsh-completion for notmuch

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
13 years agoAdd notmuch.1.gz to files to be cleaned
Mikhail Gusarov [Fri, 20 Nov 2009 12:58:39 +0000 (18:58 +0600)]
Add notmuch.1.gz to files to be cleaned

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
13 years agoTODO: Add a couple of notes about fixing the completion script.
Carl Worth [Fri, 20 Nov 2009 16:04:29 +0000 (17:04 +0100)]
TODO: Add a couple of notes about fixing the completion script.

I'm throwing away a half-finished fix of this now, and just want to
ensure I don't forget about it.

13 years agoMakefile: Make object targets depend on Makefiles
Jan Janak [Thu, 19 Nov 2009 00:37:25 +0000 (01:37 +0100)]
Makefile: Make object targets depend on Makefiles

All objects need to be recompiled when any of the Makefiles changes, so
we make them all depend on all the Makefiles.

Signed-off-by: Jan Janak <jan@ryngle.com>
13 years agoAllow to redefine notmuch binary name and path in elisp mode
Mikhail Gusarov [Fri, 20 Nov 2009 01:15:40 +0000 (07:15 +0600)]
Allow to redefine notmuch binary name and path in elisp mode

Signed-off-by: Mikhail Gusarov <dottedmag@dottedmag.net>
13 years agonotmuch.el: Don't use literal control characters in strings.
Carl Worth [Fri, 20 Nov 2009 12:09:58 +0000 (13:09 +0100)]
notmuch.el: Don't use literal control characters in strings.

Avoding these is nicer to users, text editors, and our poor little
notmuch.el code itself that would get confused when seeing a copy of
itself in email. (Of course, we should still fix that bug, but this
workaround is good nonetheless.)

13 years agoMakefile: Hard-code emacs_lispdir if emacs pkg-config file not available
Carl Worth [Fri, 20 Nov 2009 12:07:42 +0000 (13:07 +0100)]
Makefile: Hard-code emacs_lispdir if emacs pkg-config file not available

Using pkg-config to find this variable is nice if it works. Go back to
the previously used value if it doesn't.

13 years agoMakefile: Remove unused variable emacs_startdir
Carl Worth [Fri, 20 Nov 2009 11:58:42 +0000 (12:58 +0100)]
Makefile: Remove unused variable emacs_startdir

This was added in a prelimnary version of a previous commit that would
automatically load notmuch.el for anyone running emacs. It's not used
at all in the current Makefile.

13 years agoAvoid access of a Xapian iterator's object when there's nothing there.
Carl Worth [Fri, 20 Nov 2009 11:06:11 +0000 (12:06 +0100)]
Avoid access of a Xapian iterator's object when there's nothing there.

This eliminates a crash when a message (either corrupted or a non-mail
file that wasn't properly detected as not being mail) has no In-Reply-To
header, (and so few terms that trying to skip to the prefix of the
In-Reply-To terms actually brings us to the end of the termlist).

13 years agoRevert inadvertently committed code.
Carl Worth [Fri, 20 Nov 2009 10:12:42 +0000 (11:12 +0100)]
Revert inadvertently committed code.

This was accidentally included with commit:


(It was a dirty chunk in my directory that I accidentally amended into
the submitted patch.)

13 years agonotmuch build: add a RPM spec file
Jeffrey C. Ollie [Wed, 18 Nov 2009 18:31:54 +0000 (12:31 -0600)]
notmuch build: add a RPM spec file

Add a spec file for building RPM packages.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
13 years agoAdd a .desktop file entry.
Jeffrey C. Ollie [Thu, 19 Nov 2009 21:20:02 +0000 (15:20 -0600)]
Add a .desktop file entry.

This will add an entry in your window manager's menus that will create
up a new emacs process and start notmuch.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
13 years agoImprove installation of emacs mode.
Jeffrey C. Ollie [Thu, 19 Nov 2009 21:20:01 +0000 (15:20 -0600)]
Improve installation of emacs mode.

1) Add a separate targets to build and install emacs mode.

2) Don't hardcode the installation directory, instead use emacs'
   pkg-config module.

3) Install a byte compiled version of the emacs mode.

4) Install the emacs mode in emacs' site-lisp directory.  Put
   "(require 'notmuch)" in your .emacs to load it automatically.

5) Ignore byte-compiled emacs files.

Signed-off-by: Jeffrey C. Ollie <jeff@ocjtech.us>
Reviewed-by: Ingmar Vanhassel <ingmar@exherbo.org>
Reviewed-by: Keith Packard <keithp@keithp.com>
13 years agoHave git ignore tags & cscope files
Rolland Santimano [Thu, 19 Nov 2009 05:16:58 +0000 (21:16 -0800)]
Have git ignore tags & cscope files

13 years agoPut $(LDFLAGS) after the list of object files.
Peter Wang [Thu, 19 Nov 2009 08:13:35 +0000 (19:13 +1100)]
Put $(LDFLAGS) after the list of object files.

Some linkers on some systems are particularly picky about the order of
arguments in order to properly linkt. So this fixes failures on some

13 years agonotmuch: Add search mode hook
Aneesh Kumar K.V [Thu, 19 Nov 2009 06:10:54 +0000 (11:40 +0530)]
notmuch: Add search mode hook

This patch add notmuch-search-hook that gets run when we
after displaying search results

Signed-off-by: Aneesh Kumar K.V <aneesh.kumar@linux.vnet.ibm.com>
Cc:Keith Packard <keithp@keithp.com>

13 years agoMakefile: Create elisp install directory explicitly
Ingmar Vanhassel [Thu, 19 Nov 2009 01:45:44 +0000 (02:45 +0100)]
Makefile: Create elisp install directory explicitly

When doing a DESTDIR install, this directory likely won't exist, and
installing notmuch.el will fail.

See 0d4b5292

13 years agobash-completion: Complete options for notmuch search
Ingmar Vanhassel [Thu, 19 Nov 2009 02:18:20 +0000 (03:18 +0100)]
bash-completion: Complete options for notmuch search

13 years agobash-completion: Localize variables, use more consistent variable names
Ingmar Vanhassel [Thu, 19 Nov 2009 02:14:52 +0000 (03:14 +0100)]
bash-completion: Localize variables, use more consistent variable names

13 years agobash-completion: Whitespace fix
Ingmar Vanhassel [Thu, 19 Nov 2009 02:12:59 +0000 (03:12 +0100)]
bash-completion: Whitespace fix

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
13 years agobash-completion: Bash has & should use [[ == ]]
Ingmar Vanhassel [Thu, 19 Nov 2009 01:58:42 +0000 (02:58 +0100)]
bash-completion: Bash has & should use [[ == ]]

Signed-off-by: Ingmar Vanhassel <ingmar@exherbo.org>
13 years agoAllow lone "not" search operators
Adrian Perez [Thu, 19 Nov 2009 00:07:22 +0000 (01:07 +0100)]
Allow lone "not" search operators

As suggested by Keith in FLAG_PURE_NOT allows for expressions like:

  notmuch search NOT tag:inbox

Note that this way a search like:

  notmuch search foobar NOT tag:inbox

should not be written instead:

  notmuch search foobar AND NOT tag:inbox

In my opinion, the latter feels more natural and is somewhat more explicit.
It gives a better clue of what the search is about instead of assuming that
an implicit AND operator is there.

13 years ago.gitignore: Add common editor droppings
Ingmar Vanhassel [Wed, 18 Nov 2009 22:51:31 +0000 (23:51 +0100)]
.gitignore: Add common editor droppings

13 years agonotmuch new: Restore printout of total files counted.
Carl Worth [Wed, 18 Nov 2009 23:32:21 +0000 (00:32 +0100)]
notmuch new: Restore printout of total files counted.

This was more fallout from the recent re-shuffling of this code.

13 years agonotmuch new: Fix countdown timer on first run.
Carl Worth [Wed, 18 Nov 2009 23:29:52 +0000 (00:29 +0100)]
notmuch new: Fix countdown timer on first run.

A recent shuffling of this code accidentally disabled the timer,
(making the time spent counting the files totally useless).

13 years agoMakefile: Actually install the emacs mode.
Carl Worth [Wed, 18 Nov 2009 23:27:34 +0000 (00:27 +0100)]
Makefile: Actually install the emacs mode.

Should have been doing this a long time ago.

13 years agonotmuch.el: Add a reply binding ('r') to search mode to reply to a whole thread.
Carl Worth [Wed, 18 Nov 2009 23:21:24 +0000 (00:21 +0100)]
notmuch.el: Add a reply binding ('r') to search mode to reply to a whole thread.

This is basically right, (I get a message buffer with all the mails
quoted), but somehow notmuch reply is reversing the messages. That's a

13 years agoreply: Pointer mismatch.
Chris Wilson [Wed, 18 Nov 2009 11:34:55 +0000 (11:34 +0000)]
reply: Pointer mismatch.

Apparently typeof (size_t) != unsigned int on my x86-64.

13 years agoMakefile: evaluate pkg-config once
Chris Wilson [Wed, 18 Nov 2009 11:34:54 +0000 (11:34 +0000)]
Makefile: evaluate pkg-config once

Currently the same `pkg-config ...` is executed for every target, so
just store the results in a variable.

13 years agoMake reply/show/tag all require at least one search term
Keith Packard [Wed, 18 Nov 2009 21:43:38 +0000 (13:43 -0800)]
Make reply/show/tag all require at least one search term

In particular, notmuch tag -inbox "" tended to take a long time to
run, happened if you hit 'a' on a blank line in the search view and
probably didn't have the desired effect.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agoHave git ignore etags file
Keith Packard [Wed, 18 Nov 2009 19:57:53 +0000 (11:57 -0800)]
Have git ignore etags file

13 years agoFilter out carriage-returns in show and reply output.
Keith Packard [Wed, 18 Nov 2009 19:55:18 +0000 (11:55 -0800)]
Filter out carriage-returns in show and reply output.

Thanks, windows mail clients.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agoWe use the message mail system for new mail, let emacs know.
Keith Packard [Wed, 18 Nov 2009 17:33:52 +0000 (09:33 -0800)]
We use the message mail system for new mail, let emacs know.

This makes things like the goto-address system bring up the right
message composition window.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agoCreate a default notmuch-show-hook that highlights URLs and uses word-wrap
Keith Packard [Wed, 18 Nov 2009 08:28:14 +0000 (00:28 -0800)]
Create a default notmuch-show-hook that highlights URLs and uses word-wrap

I created the notmuch-show-hook precisely so I could add these two
options, but I suspect most people will want them, so I just made them
the default. If you don't want them, you can use remove-hook to get
rid of this.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agoSet truncate-lines variable for search buffers.
Keith Packard [Wed, 18 Nov 2009 08:12:31 +0000 (00:12 -0800)]
Set truncate-lines variable for search buffers.

This keeps them from wrapping.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agoAdd notmuch-show-hook to allow customization of show windows
Keith Packard [Tue, 17 Nov 2009 06:06:49 +0000 (22:06 -0800)]
Add notmuch-show-hook to allow customization of show windows

I wanted to enable got-address-mode and visual-line-mode in my show
windows to make messages easier to read and URLs easier to
follow. This hook allows the user to run arbitrary code each time a
message is shown.

Signed-off-by: Keith Packard <keithp@keithp.com>
13 years agocount_files: sort directory in inode order before statting
Stewart Smith [Wed, 18 Nov 2009 02:22:20 +0000 (13:22 +1100)]
count_files: sort directory in inode order before statting

Carl says: This has similar performance benefits as the previous
patch, and I fixed similar style issues here as well, (including
missing more of a commit message than the one-line summary).

13 years agoMinor style fixups for the previous fix.
Carl Worth [Wed, 18 Nov 2009 21:27:32 +0000 (22:27 +0100)]
Minor style fixups for the previous fix.

Use consistent whitespace, a slightly less abbreviated identifier, and
avoid a C99 declaration after statement.

13 years agoRead mail directory in inode number order
Stewart Smith [Wed, 18 Nov 2009 01:56:40 +0000 (12:56 +1100)]
Read mail directory in inode number order

This gives a rather decent reduction in number of seeks required when
reading a Maildir that isn't in pagecache.

Most filesystems give some locality on disk based on inode numbers.
In ext[234] this is the inode tables, in XFS groups of sequential inode
numbers are together on disk and the most significant bits indicate
allocation group (i.e inode 1,000,000 is always after inode 1,000).

With this patch, we read in the whole directory, sort by inode number
before stat()ing the contents.

Ideally, directory is sequential and then we make one scan through the
file system stat()ing.

Since the universe is not ideal, we'll probably seek during reading the
directory and a fair bit while reading the inodes themselves.

However... with readahead, and stat()ing in inode order, we should be
in the best place possible to hit the cache.

In a (not very good) benchmark of "how long does it take to find the first
15,000 messages in my Maildir after 'echo 3 > /proc/sys/vm/drop_caches'",
this patch consistently cut at least 8 seconds off the scan time.

Without patch: 50 seconds
With patch: 38-42 seconds.

(I did this in a previous maildir reading project and saw large improvements too)

13 years agoMake '?" bring up a list of bindings.
Carl Worth [Wed, 18 Nov 2009 18:12:13 +0000 (19:12 +0100)]
Make '?" bring up a list of bindings.

Just using describe-mode for now, (though something more specialized
would be better).

13 years agoFix linking with gcc to use g++ to link in C++ libs.
Stewart Smith [Wed, 18 Nov 2009 01:05:53 +0000 (12:05 +1100)]
Fix linking with gcc to use g++ to link in C++ libs.

Previously, Ubuntu 9.10, gcc 4.4.1 was getting:

/usr/bin/ld: lib/notmuch.a(database.o): in function global
constructors keyed to BOOLEAN_PREFIX_INTERNAL:database.cc(.text+0x3a):
error: undefined reference to 'std::ios_base::Init::Init()'

13 years agonotmuch main(): Remove stale comment.
Carl Worth [Wed, 18 Nov 2009 13:22:14 +0000 (05:22 -0800)]
notmuch main(): Remove stale comment.

The code this comment was referring to has since been deleted.

13 years agonotmuch help: Print to stdout, not to stderr.
Lars Kellogg-Stedman [Wed, 18 Nov 2009 01:01:16 +0000 (20:01 -0500)]
notmuch help: Print to stdout, not to stderr.

Let usage() take a FILE * argument so that you can output to stderr in
response to usage errors, and stdout in response to an explicit

13 years agonotmuch search: Avoid infinite stream of exceptions from "notmuch search"
Carl Worth [Wed, 18 Nov 2009 11:29:30 +0000 (03:29 -0800)]
notmuch search: Avoid infinite stream of exceptions from "notmuch search"

That is, give a nice error message and exit if no search terms are
provided. Thanks to Priit Laes <plaes@plaes.org> for reporting the
error and providing an early version of the fix.

13 years agoREADME: Mention the actual mailing list address now that it exists.
Carl Worth [Wed, 18 Nov 2009 11:24:27 +0000 (03:24 -0800)]
README: Mention the actual mailing list address now that it exists.

Much better than telling people to mail me individually.

13 years agoTypsos
Ingmar Vanhassel [Tue, 17 Nov 2009 23:23:42 +0000 (00:23 +0100)]

13 years agoOlder versions of install do not support -C.
Jan Janak [Tue, 17 Nov 2009 22:18:47 +0000 (23:18 +0100)]
Older versions of install do not support -C.

Do not use -C cmdline option of install, older versions, commonly found in
distributions like Debian, do not seem to support it. Running make install
on such systems (tested on Debian Lenny) fails.

Signed-off-by: Jan Janak <jan@ryngle.com>
13 years agolinke_message: Avoid segfault when In-Reply-to header is empty.
Carl Worth [Wed, 18 Nov 2009 09:36:30 +0000 (01:36 -0800)]
linke_message: Avoid segfault when In-Reply-to header is empty.

This was recently introduced in commit:


which was adding extra checks to avoid adding a self-referencing

How many times am I going to fix a dumb regression like this and say
"we really need a test suite" before I actually sit down and write the
test suite?

13 years agonotmuch-completion.bash: Update for new commands and help.
Carl Worth [Wed, 18 Nov 2009 09:29:19 +0000 (01:29 -0800)]
notmuch-completion.bash: Update for new commands and help.

Would be nice to add the options for "notmuch search" too.

13 years agonotmuch help: Update documentation (following recent text from notmuch.1)
Carl Worth [Wed, 18 Nov 2009 07:37:21 +0000 (23:37 -0800)]
notmuch help: Update documentation (following recent text from notmuch.1)

We take the recently created text from the notmuch manual page and
update the "notmuch help" command to use similar text. In particular,
we add a new "notmuch help search-terms" for documenting the search
syntax that is common to several commands.

13 years agonotmuch.1: Fix a couple of typos.
Carl Worth [Wed, 18 Nov 2009 07:36:44 +0000 (23:36 -0800)]
notmuch.1: Fix a couple of typos.

Little things I noticed while using this text as reference for the
"notmuch help" documentation.

13 years agoman.1: A big update of the notmuch manual page.
Carl Worth [Wed, 18 Nov 2009 06:16:35 +0000 (22:16 -0800)]
man.1: A big update of the notmuch manual page.

I set out merely to add documentation for the recently-added options
for "notmuch search" (--first, --max-threads, and --sort), but ended
up revamping a lot. A significant change is a new SEARCH SYNTAX
section separate from "notmuch search" that is referred to in the
documentation of search, show, reply, and tag.

Also many sections were updated to reflect recent changes, (such as
the dropping of the NOTMUCH_BASE environment variable, the addition of
the .notmuch-config file, etc.)

13 years agoMakefile: Fix missing dependency for notmuch.1 manual page.
Carl Worth [Wed, 18 Nov 2009 05:04:31 +0000 (21:04 -0800)]
Makefile: Fix missing dependency for notmuch.1 manual page.

The Makefile was failing to regnerate the notmuch.1.gz file when
notmuch.1 was updated, (so stale documentation could potentially be

13 years agonotmuch search: Change default search order to be newest messages first.
Carl Worth [Wed, 18 Nov 2009 04:52:09 +0000 (20:52 -0800)]
notmuch search: Change default search order to be newest messages first.

This is what most people want for a _search_ command. It's often
different for actually reading mail in an inbox, (where it makes more
sense to have results displayed in chronological order), but in such a
case, ther user is likely using an interface that can simply pass the
--sort=oldest-first option to "notmuch search".

Here we're also change the sort enum from NOTMUCH_SORT_DATE and
NOTMUCH_SORT_NEWEST_FIRST. Similarly we replace the --reverse option
to "notmuch search" with two options: --sort=oldest-first and

Finally, these changes are all tracked in the emacs interface, (which
has no change in its behavior).

13 years agonotmuch search: Return first 100 results as quickly as possible.
Carl Worth [Wed, 18 Nov 2009 03:11:05 +0000 (19:11 -0800)]
notmuch search: Return first 100 results as quickly as possible.

This is one of those cases where total time is not the metric of
interest. We increase the total time of the search, (by doing some
redundant work for the initial threads). But more significantly, we
give the user *some* results nearly instantaneously, (so that the user
might see the result of interest without ever even waiting for the
complete results to come in).

13 years agoAdd some const correctness to talloc 'ctx' parameter.
Carl Worth [Wed, 18 Nov 2009 03:10:37 +0000 (19:10 -0800)]
Add some const correctness to talloc 'ctx' parameter.

The tentacles of const just keep reaching out.

13 years agodatabase: Make _parse_message_id static once again.
Carl Worth [Wed, 18 Nov 2009 02:50:13 +0000 (18:50 -0800)]
database: Make _parse_message_id static once again.

We had exposed this to the internal implementation for a short time,
(only while we had the silly code fetching In-Reply-To values from
message files instead of from the database). Make this private again
as it should be.

13 years agodatabase: Add "replyto" to the database schema documentation.
Carl Worth [Wed, 18 Nov 2009 02:48:38 +0000 (18:48 -0800)]
database: Add "replyto" to the database schema documentation.

Maybe ths lack of this documentation is why I forgot we were actually
storing this and wrote the ugly code to fetch In-Reply-To from message
files rather than from the database.

13 years agodatabase: Rename "ref" prefix name to "reference"
Carl Worth [Wed, 18 Nov 2009 02:44:02 +0000 (18:44 -0800)]
database: Rename "ref" prefix name to "reference"

Which is more consistent with the XREFERENCE prefix used in the terms
in the database. Also remove some stale documentation describing the
removal of resolved references from the database (we no longer do

13 years agomessage_file_get_header: Use break where more clear than continue.
Carl Worth [Wed, 18 Nov 2009 02:37:45 +0000 (18:37 -0800)]
message_file_get_header: Use break where more clear than continue.

Calling continue here worked only because we set a flag before the
continue, and, check the flag at the beginning of the loop, and *then*
break. It's much more clear to just break in the first place.

13 years agoFix "too many open files" bug by closing message files when done with them.
Keith Packard [Wed, 18 Nov 2009 02:33:42 +0000 (18:33 -0800)]
Fix "too many open files" bug by closing message files when done with them.

The message file header parsing code parses only enough of the file to
find the desired header fields, then it leaves the file open until the
next header parsing call or when the message is no longer in use. If a
large number of messages end up being active, this will quickly run
out of file descriptors.

Here, we add support to explicitly close the message file within a
message, (_notmuch_message_close) and call that from thread
construction code.

Signed-off-by: Keith Packard <keithp@keithp.com>
Edited-by: Carl Worth <cworth@cworth.org>:
Many portions of Keith's original patch have since been solved other
ways, (such as the code that changed the handling of the In-Reply-To
header). So the final version is clean enough that I think even Keith
would be happy to have his name on it.

13 years agonotmuch show: Detect an internal error if a thread has no messages.
Carl Worth [Wed, 18 Nov 2009 01:53:54 +0000 (17:53 -0800)]
notmuch show: Detect an internal error if a thread has no messages.

This really should be impossible---if there are no messages, then what
was the thread object created from? During recent debugging, it was
useful to have this error detected and reported.