]> git.cworth.org Git - notmuch/log
notmuch
3 years agotest: add prereqs check in test_emacs_expect_t
Felipe Contreras [Sat, 1 May 2021 11:54:15 +0000 (06:54 -0500)]
test: add prereqs check in test_emacs_expect_t

test_emacs may update the external prereqs, in which case we want to
skip the test rather than fail.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agotest: fix wrong SKIP messages
Felipe Contreras [Sat, 1 May 2021 11:54:14 +0000 (06:54 -0500)]
test: fix wrong SKIP messages

When the external prereqs are updated inside the body of the command
(e.g. test_emacs) the message in test_report_skip_ is wrong: it outputs
the body of the command instead of the subtest name.

We need to pass the same argument we pass to test_skip.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agotest: use correct fqdn in passwd_sanitize()
Felipe Contreras [Sat, 1 May 2021 11:54:13 +0000 (06:54 -0500)]
test: use correct fqdn in passwd_sanitize()

My fqdn is 'natae.localdomain', however, socket.getfqdn() returns
'localhost'.

To fetch the true fqdn we need socket.getaddrinfo().

For more information see: https://stackoverflow.com/a/11580042/10474

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agotest: unset NAME environment variable
Felipe Contreras [Sat, 1 May 2021 11:54:11 +0000 (06:54 -0500)]
test: unset NAME environment variable

Otherwise the output from the tests would be different.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agotest: fix passwd_sanitize()
Felipe Contreras [Sat, 1 May 2021 11:54:10 +0000 (06:54 -0500)]
test: fix passwd_sanitize()

If any of the variables is empty the output is completely messed up,
because replace("", "FOO") puts "FOO" before every single character.

I don't have my full name configured, and this is what I get:

  USER_FULL_NAME=USER_FULL_NAME=USER_FULL_NAME USER_FULL_NAMEsUSER_FULL_NAMEtUSER_FULL_NAMEdUSER_FULL_NAMEoUSER_FULL_NAMEuUSER_FULL_NAMEtUSER_FULL_NAME USER_FULL_NAME=USER_FULL_NAME=USER_FULL_NAME

Let's check for empty strings before doing any replace.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agoperf-test: add option to run perf
David Bremner [Sun, 25 Apr 2021 15:23:52 +0000 (12:23 -0300)]
perf-test: add option to run perf

Although the generation of perf data is not as slow as valgrind, it
seems simplest to re-use the machinery already there to save the logs
in a timestamped subdirectory.

3 years agoMerge tag '0.32_rc2'
David Bremner [Wed, 28 Apr 2021 10:32:44 +0000 (07:32 -0300)]
Merge tag '0.32_rc2'

notmuch 0.32~rc2 release

3 years agodebian: add changelog for 0.32~rc2-1 0.32_rc2 archive/debian/0.32_rc2-1 debian/0.32_rc2-1
David Bremner [Wed, 28 Apr 2021 10:06:31 +0000 (07:06 -0300)]
debian: add changelog for 0.32~rc2-1

3 years agoversion: bump to 0.32~rc2
David Bremner [Wed, 28 Apr 2021 10:04:57 +0000 (07:04 -0300)]
version: bump to 0.32~rc2

3 years agoNEWS: fix typo
David Bremner [Wed, 28 Apr 2021 10:01:53 +0000 (07:01 -0300)]
NEWS: fix typo

Spellcheckers, is that like spellchess?

3 years agoNEWS: summarize changes to emacs interface.
David Bremner [Tue, 27 Apr 2021 00:12:02 +0000 (21:12 -0300)]
NEWS: summarize changes to emacs interface.

This my attempt at a summary based on git log.

Amended: with suggestions from id:87wnsmkf12.fsf@bernoul.li

3 years agoRevert "Vim: Ensure that every queries respect excluded tags"
David Bremner [Tue, 27 Apr 2021 23:34:06 +0000 (20:34 -0300)]
Revert "Vim: Ensure that every queries respect excluded tags"

This reverts commit 0998fa9a09387b622d770fc8c5f780a951b0cf2a.

per id:CAMP44s2k+fthVXCS9R9kQRzzwWbnS7RAcKg1Q0m6q5Ybzdm71Q@mail.gmail.com

3 years agoNEWS: mention file deletion speedups
David Bremner [Mon, 26 Apr 2021 23:53:01 +0000 (20:53 -0300)]
NEWS: mention file deletion speedups

It seems a bit silly to have two NEWS entries for one commit, but
there are two potiential audiences.

3 years agoVim: Ensure that every queries respect excluded tags
Jules Aguillon [Tue, 16 Feb 2021 23:43:16 +0000 (00:43 +0100)]
Vim: Ensure that every queries respect excluded tags

This makes sure that the bug solved by the previous commit won't happen again
and remove some dupplication.
This shouldn't have any side effect.

3 years agoVim: Respect excluded tags when showing a thread
Jules Aguillon [Tue, 16 Feb 2021 23:43:15 +0000 (00:43 +0100)]
Vim: Respect excluded tags when showing a thread

Other queries have exclude_tags taken into account but this one.
This is annoying when using an excluded tag to ignore past messages from a
thread (for example the 'deleted' tag), the entire thread is shown all the
time.

3 years agovim: fix Mail 2.8.0 warning
Felipe Contreras [Sun, 18 Apr 2021 22:48:39 +0000 (17:48 -0500)]
vim: fix Mail 2.8.0 warning

  Passing an unparsed header field to Mail::Field.new is deprecated and will be removed in Mail 2.8.0. Use Mail::Field.parse instead.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agotest: hide message from moreutils parallel.
David Bremner [Mon, 26 Apr 2021 12:00:11 +0000 (09:00 -0300)]
test: hide message from moreutils parallel.

The argument --version confuses moreutils parallel, but this is OK,
because its confusing does not include printing "GNU"

3 years agotest: check for GNU parallel with --version options
Tobias Backer Dirks [Sat, 24 Apr 2021 20:41:03 +0000 (21:41 +0100)]
test: check for GNU parallel with --version options

The lastest versions of GNU parallel no longer make mention of GNU
within their help output. This causes the test script to mistakenly use
the moreutils parallel execution. In order to fix this, while
maintaining compatibility with previous versions of GNU parallel,
--version should be used.

Signed-off-by: Tobias Backer Dirks <omgitsaheadcrab@gmail.com>
3 years agodebian: bump changelog version 0.32_rc1 archive/debian/0.32_rc1-1 debian/0.32_rc1-1
David Bremner [Sat, 24 Apr 2021 15:46:32 +0000 (12:46 -0300)]
debian: bump changelog version

3 years agoversion: bump to 0.32~rc1
David Bremner [Sat, 24 Apr 2021 15:26:09 +0000 (12:26 -0300)]
version: bump to 0.32~rc1

3 years agodebian: add xapian-tools for tests
David Bremner [Sat, 24 Apr 2021 15:13:37 +0000 (12:13 -0300)]
debian: add xapian-tools for tests

xapian-metadata is used by some of the new tests.

3 years agolib/config: remove early free in _get_email_from_passwd_file
David Bremner [Sat, 24 Apr 2021 13:44:28 +0000 (10:44 -0300)]
lib/config: remove early free in _get_email_from_passwd_file

This (obvious) bug was caused by cut&pasting the code from
notmuch-config.c into the library and adding on a return at the end.

3 years agotest: replace notmuch_passwd_sanitize with python version
David Bremner [Sat, 24 Apr 2021 12:28:15 +0000 (09:28 -0300)]
test: replace notmuch_passwd_sanitize with python version

Apparently the -f option to hostname is not portable, and in fact it
does not seem to always behave reasonably in e.g. a chroot.

Python code originally due to Tomi [1], modified by yours truly.

[1]: id:m2lf9fbkug.fsf@guru.guru-group.fi

3 years agodebian: update d/libnotmuch5 0.32_rc0
David Bremner [Sat, 24 Apr 2021 11:55:45 +0000 (08:55 -0300)]
debian: update d/libnotmuch5

This corresponds to libnotmuch 5.3. It should be backward compatible
because it only adds symbols.

3 years agodebian: start changelog for 0.32~rc0-1
David Bremner [Sat, 24 Apr 2021 11:49:44 +0000 (08:49 -0300)]
debian: start changelog for 0.32~rc0-1

3 years agoupdate version to 0.32~rc0
David Bremner [Sat, 24 Apr 2021 11:45:54 +0000 (08:45 -0300)]
update version to 0.32~rc0

3 years agocompat: rename {,notmuch_}canonicalize_file_name
Đoàn Trần Công Danh [Sat, 24 Apr 2021 01:05:37 +0000 (08:05 +0700)]
compat: rename {,notmuch_}canonicalize_file_name

When compat canonicalize_file_name was introduced, it was limited to
C code only because it was used by C code only during that time.

>From 5ec6fd4d, (lib/open: check for split configuration when creating
database., 2021-02-16), lib/open.cc, which is C++, relies on the
existent of canonicalize_file_name.

However, we can't blindly enable canonicalize_file_name for C++ code,
because different implementation has different additional signature for
C++ and users can arbitrarily add -DHAVE_CANONICALIZE_FILE_NAME=0 to
{C,CXX}FLAGS.

Let's move our implementation into a util library.

Helped-by: Tomi Ollila <tomi.ollila@iki.fi>
Signed-off-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
3 years agoruby: fix ruby 3.1 warnings
Felipe Contreras [Fri, 16 Apr 2021 20:27:31 +0000 (15:27 -0500)]
ruby: fix ruby 3.1 warnings

  init.c:214:5: warning: ‘rb_cData’ is deprecated: by: rb_cObject.  Will be removed in 3.1. [-Wdeprecated-declarations]

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
3 years agolib/n_d_index_file: check return value from _n_m_add_filename
David Bremner [Sat, 20 Mar 2021 13:10:52 +0000 (10:10 -0300)]
lib/n_d_index_file: check return value from _n_m_add_filename

Ignoring this return value seems like a bad idea in general, and in
particular it has been hiding one or more bugs related to handling
long directory names.

3 years agotest-lib: unset XDG_CONFIG_HOME
Đoàn Trần Công Danh [Sun, 18 Apr 2021 03:48:46 +0000 (10:48 +0700)]
test-lib: unset XDG_CONFIG_HOME

lib/open.cc:_load_key_file will only open xdg-config files in
$XDG_CONFIG_HOME if it's defined, $HOME/.config will be considered if
and only if XDG_CONFIG_HOME not defined.

Let's unset said variable before running the test.

3 years agolib: directly traverse postlists in _n_message_delete
David Bremner [Fri, 16 Apr 2021 12:00:39 +0000 (09:00 -0300)]
lib: directly traverse postlists in _n_message_delete

This is intended to fix the slow behaviour of "notmuch new" (and possibly
"notmuch reindex") when large numbers of files are deleted.

The underlying issue [1] seems to be the Xapian glass backend spending
a large amount of time in db.has_positions when running queries with
large-ish amounts of unflushed changes.

This commit removes two uses of Xapian queries [2], and replaces them with
an approximation of what Xapian would do after optimizing the
queries. This avoids the calls to has_positions (which are in any case
un-needed because we are only using boolean terms here).

[1] Thanks to "andres" on IRC for narrowing down the performance
bottleneck.

[2] Thanks to Olly Betts of Xapian fame for talking me a through a fix
that does not require people to update Xapian.

3 years agoperf-tests: add test for removing files.
David Bremner [Fri, 16 Apr 2021 12:00:38 +0000 (09:00 -0300)]
perf-tests: add test for removing files.

Without the proposed fix for deletion performance [1], this test is
probably unreasonably slow compared to others at the same
small/medium/large scale.

[1]: id:20210414021627.1236560-3-david@tethera.net

3 years agotest: put shim at end of LD_PRELOAD path
David Bremner [Sat, 13 Mar 2021 12:43:37 +0000 (08:43 -0400)]
test: put shim at end of LD_PRELOAD path

Certain tools like the address-sanitizer fail if they are not the
first LD_PRELOADed library. It does not seem to matter for our shims,
as long as they are loaded before libnotmuch.

3 years agoNEWS: user visible config related changes for 0.32
David Bremner [Sat, 10 Apr 2021 12:49:37 +0000 (09:49 -0300)]
NEWS: user visible config related changes for 0.32

3 years agoCLI: rename notmuch_config_t to notmuch_conffile_t
David Bremner [Sat, 27 Feb 2021 14:11:23 +0000 (10:11 -0400)]
CLI: rename notmuch_config_t to notmuch_conffile_t

The name is a compromise between keeping function names from getting
too long, and avoiding confusion with the newer notmuch_config library
API. Try to make clear that the residual functionality is only about
updating configuration files.

3 years agoCLI: drop notmuch_config_t from subcommand interface.
David Bremner [Sat, 27 Feb 2021 14:07:45 +0000 (10:07 -0400)]
CLI: drop notmuch_config_t from subcommand interface.

At this point it is unused in all subcommands.

3 years agoCLI/config: remove calls to notmuch_config_open from top level
David Bremner [Sat, 27 Feb 2021 13:22:32 +0000 (09:22 -0400)]
CLI/config: remove calls to notmuch_config_open from top level

This will allow simplifying the subcommand interface.

Change the internal API to notmuch_config_open to not tie it to the
implementation of subcommands in notmuch.c.

It also fixes a previously broken test, since notmuch_config_open does
not understand the notion of the empty string as a config file name.

3 years agoCLI/config: support set/get with split configuration
David Bremner [Thu, 25 Feb 2021 12:00:26 +0000 (08:00 -0400)]
CLI/config: support set/get with split configuration

There are two small code changes. The main one is to retrieve the
possibly updated config file name found during the database opening
call. The second change is to allow empty config file names, as
a (currently broken) way of specifying that configuration should only
be taken from the database.

3 years agolib: provide notmuch_config_path
David Bremner [Sun, 21 Feb 2021 11:34:52 +0000 (07:34 -0400)]
lib: provide notmuch_config_path

Since the library searches in several locations for a config file, the
caller does not know which of these is chosen in the usual case of
passing NULL as a config file. This changes provides an API for the
caller to retrieve the name of the config file chosen. It will be
tested in a following commit.

3 years agoCLI+lib: detect missing database in split configurations.
David Bremner [Tue, 23 Feb 2021 20:19:13 +0000 (16:19 -0400)]
CLI+lib: detect missing database in split configurations.

Eventually we want to do all opening of databases in the top
level (main function). This means that detection of missing databases
needs to move out of subcommands. It also requires updating the
library to use the new NO_DATABASE status code.

3 years agolib: add NOTMUCH_STATUS_NO_DATABASE
David Bremner [Tue, 23 Feb 2021 19:56:47 +0000 (15:56 -0400)]
lib: add NOTMUCH_STATUS_NO_DATABASE

This will allow more precise return values from various open related functions.

3 years agoCLI/config: default to storing all config in external files
David Bremner [Fri, 19 Feb 2021 12:41:36 +0000 (08:41 -0400)]
CLI/config: default to storing all config in external files

Previously the fact that some configuration options were only stored
in the database (and thus editing the config file had no effect) was a
source of user confusion. This was fixed with the series ending at
d9af0af1646.

On the other hand, the underlying partition of config options into
those stored by default in the database and those stored in the config
file remained. This is also confusing, since now some invocations of
"notmuch config set" modify the config file, and others silently
modify the database instead.

With this commit, it is up to the user to decide which configuration
to modify. A new "--database" option is provided for notmuch config to
enable modifying the configuration information in the database;
otherwise the default is to update an external config file.

3 years agoCLI/config: drop cached data from notmuch_config_t
David Bremner [Sun, 14 Feb 2021 18:36:18 +0000 (14:36 -0400)]
CLI/config: drop cached data from notmuch_config_t

The idea is to preserve notmuch_config_t as a thin wrapper for GKeyFile.

3 years agoCLI/config: drop obsolete notmuch_config_get_*
David Bremner [Sun, 14 Feb 2021 18:02:51 +0000 (14:02 -0400)]
CLI/config: drop obsolete notmuch_config_get_*

These are no longer used, replaced by notmuch_config_get.

3 years agoCLI/notmuch: switch notmuch_command to notmuch_config_get
David Bremner [Tue, 23 Feb 2021 13:22:37 +0000 (09:22 -0400)]
CLI/notmuch: switch notmuch_command to notmuch_config_get

The goal at this point is to remove the dependence on
notmuch_config_get_* without breaking any existing functionality. This
is a step towards removing notmuch_config_get_* in a future commit.

3 years agoCLI/config: use notmuch_database_reopen
David Bremner [Sun, 14 Feb 2021 17:46:13 +0000 (13:46 -0400)]
CLI/config: use notmuch_database_reopen

This allows `notmuch config` to use the common configuration
information carried by the notmuch_database_t opened at the top level.

3 years agoCLI/config: migrate notmuch_config_open to new config
David Bremner [Sun, 14 Feb 2021 13:32:41 +0000 (09:32 -0400)]
CLI/config: migrate notmuch_config_open to new config

notmuch_config_open will be preserved in the medium term for use by
the commands that are manipulating the config file directly (config
and setup)

3 years agoCLI/config: switch "notmuch config list" to merged config
David Bremner [Sun, 14 Feb 2021 11:54:22 +0000 (07:54 -0400)]
CLI/config: switch "notmuch config list" to merged config

Use the database opened at the top level rather than opening another
notmuch_database_t.

Test output changes because keys are now listed in alphabetical order,
and because a missing database is no longer an error.

3 years agoCLI/setup: switch to new configuration framework
David Bremner [Sat, 13 Feb 2021 17:49:32 +0000 (13:49 -0400)]
CLI/setup: switch to new configuration framework

Most of the changes are the elimination of notmuch_config_t accessor
use. We also migrate some of the diagnostics to the top level where we
are opening the files in question.

3 years agotest/setup: check file output instead of notmuch config list
David Bremner [Sat, 27 Feb 2021 14:50:33 +0000 (10:50 -0400)]
test/setup: check file output instead of notmuch config list

This allows verification of comments added to new / updated config
file.

3 years agoCLI/config: use merged config for "config get"
David Bremner [Sat, 13 Feb 2021 13:01:50 +0000 (09:01 -0400)]
CLI/config: use merged config for "config get"

This commit starts the conversion of notmuch-config.c
functionality (as opposed to just interface) to the new config
framework.

The change to T030-config is because of the move of the
canonicalization database paths from the notmuch_config_t accessor to
the internal function _choose_database_path.

3 years agoCLI: load merged config at top level
David Bremner [Wed, 10 Feb 2021 00:26:40 +0000 (20:26 -0400)]
CLI: load merged config at top level

This paves the way for the conversion of the remaining subcommands to
the new configuration framework.

3 years agolib/open: canonicalize relative path read from config file
David Bremner [Wed, 3 Mar 2021 12:31:44 +0000 (08:31 -0400)]
lib/open: canonicalize relative path read from config file

This matches functionality in the the CLI function
notmuch_config_get_database_path, which was previously used in the CLI
code for all calls to open a database.

3 years agolib/config: set default for primary user email
David Bremner [Sun, 14 Feb 2021 13:55:42 +0000 (09:55 -0400)]
lib/config: set default for primary user email

This is mainly copying code from the CLI into the lib. The CLI copy
will be deleted in a later commit.

3 years agolib/config: set defaults for user full name
David Bremner [Sun, 14 Feb 2021 13:23:44 +0000 (09:23 -0400)]
lib/config: set defaults for user full name

This just copies code from from the CLI into the library. New test
infrastructure is needed because apparently we have never tested this
code path.

3 years agolib/config: add config_pairs iterators
David Bremner [Sun, 14 Feb 2021 11:42:58 +0000 (07:42 -0400)]
lib/config: add config_pairs iterators

The layer of shims here seems a bit wasteful compared to just calling
the corresponding string map functions directly, but it allows control
over the API (calling with notmuch_database_t *) and flexibility for
future changes.

3 years agolib/config: add notmuch_config_get_values_string
David Bremner [Sat, 13 Feb 2021 17:17:52 +0000 (13:17 -0400)]
lib/config: add notmuch_config_get_values_string

This is to support the less common (at least in the notmuch codebase)
case of accessing a ;-delimited list config value with an arbitrary
string key.

3 years agolib: provide notmuch_database_load_config
David Bremner [Tue, 9 Feb 2021 23:48:38 +0000 (19:48 -0400)]
lib: provide notmuch_database_load_config

This is mainly targetted at notmuch-config.c, or similar applications
that don't necessarily need both a configuration file and a database
to exist.

3 years agolib/open: pull _load_key_file out of _choose_database_path
David Bremner [Thu, 11 Feb 2021 00:02:37 +0000 (20:02 -0400)]
lib/open: pull _load_key_file out of _choose_database_path

Although this increases code duplication, it also increases
flexibility in handling various combinations of missing config file
and missing database.

3 years agotest: convert random-corpus to use n_d_open_with_config
David Bremner [Sun, 14 Feb 2021 17:54:37 +0000 (13:54 -0400)]
test: convert random-corpus to use n_d_open_with_config

Remove one more usage of notmuch_config_get_database_path

3 years agolib: add missing status strings
David Bremner [Sun, 14 Feb 2021 17:42:42 +0000 (13:42 -0400)]
lib: add missing status strings

3 years agolib/open: fix leaks calling _trial_open
David Bremner [Sat, 27 Mar 2021 12:12:28 +0000 (09:12 -0300)]
lib/open: fix leaks calling _trial_open

_trial_open can't know if the PATH_ERROR return value will cause the
error message to be returned from the library, so it's up the caller
to clean up if not.

3 years agoCLI/new: use configuration variable for backup directory
David Bremner [Wed, 17 Feb 2021 15:26:15 +0000 (11:26 -0400)]
CLI/new: use configuration variable for backup directory

The stat is essentially replaced by the mkdir for error detection
purposes.  This changes the default location for backups to make
things tidier, even in non-split configurations. Hopefully there is
not too many user scripts relying on the previous location.

Because the default location may not exist, replace the use of stat
for error detection with a call to mkdir.

3 years agolib/config: add configuration variable for backup directory
David Bremner [Wed, 17 Feb 2021 15:04:54 +0000 (11:04 -0400)]
lib/config: add configuration variable for backup directory

Like the hook directory, we primarily need a way to communicate this
directory between various components, but we may as well let the user
configure it.

Most of the diff is generalizing choose_hook_dir to work for both
backup and hook directories.

3 years agolib/open: fix hook directory calculation in split configuration
David Bremner [Wed, 17 Feb 2021 11:16:54 +0000 (07:16 -0400)]
lib/open: fix hook directory calculation in split configuration

Choose sibling directory of xapian database, as .notmuch may not
exist.

libgen.h is already used in debugger.c, so it is not a new dependency
/ potential portability problem.

3 years agolib/compact: enable split config
David Bremner [Tue, 2 Feb 2021 11:51:23 +0000 (07:51 -0400)]
lib/compact: enable split config

This promotes _choose_xapian_path from static to extern linkage in
order to share between open.cc and database.cc.

3 years agoCLI/insert: support split database and mail root
David Bremner [Sat, 9 Jan 2021 11:29:07 +0000 (07:29 -0400)]
CLI/insert: support split database and mail root

The new test is in T055-path-config because it uses the helper
function split_config, and because it seems easier to put the
database path related tests in one place.

3 years agolib/open: support XDG_DATA_HOME as a fallback database location.
David Bremner [Mon, 4 Jan 2021 00:04:46 +0000 (20:04 -0400)]
lib/open: support XDG_DATA_HOME as a fallback database location.

This changes some error reporting, either intentionally by reporting
the highest level missing directory, or by side effect from looking in
XDG locations when given null database location.

3 years agoCLI/new: support split database and mail location
David Bremner [Sat, 9 Jan 2021 11:25:25 +0000 (07:25 -0400)]
CLI/new: support split database and mail location

This adds new state variable for the mail root, and uses it most
places db_path was used. The notable exception is dumps from
backups. The latter will be dealt with properly in a future commit.

3 years agolib/open: check for split configuration when creating database.
David Bremner [Wed, 17 Feb 2021 00:08:23 +0000 (20:08 -0400)]
lib/open: check for split configuration when creating database.

The main functionality will be tested when notmuch-new is converted to
support split configuration. Here only the somewhat odd case of split
mail root which is actually symlinked to the database path is tested.

3 years agolib: support splitting mail from database location.
David Bremner [Thu, 31 Dec 2020 22:20:31 +0000 (18:20 -0400)]
lib: support splitting mail from database location.

Introduce a new configuration value for the mail root, and use it to
locate mail messages in preference to the database.path (which
previously implied the mail messages were also in this location.

Initially only a subset of the CLI is tested in a split
configuration. Further changes will be needed for the remainder of the
CLI to work in split configurations.

3 years agolib/open: Use check for existing database by trial opening
David Bremner [Sun, 7 Feb 2021 16:54:45 +0000 (12:54 -0400)]
lib/open: Use check for existing database by trial opening

This is a bit heavyweight for now, but it will make more sense when we
check multiple locations for the Xapian database.

3 years agolib/open: use _finish_open in n_d_create_with_config
David Bremner [Sat, 30 Jan 2021 17:30:18 +0000 (13:30 -0400)]
lib/open: use _finish_open in n_d_create_with_config

This avoids reading the configuration file twice.

3 years agolib/open: factor out the second half of n_d_open_with_config
David Bremner [Sat, 30 Jan 2021 17:57:32 +0000 (13:57 -0400)]
lib/open: factor out the second half of n_d_open_with_config

The idea is to allow reuse in n_d_create_with_config. This is
primarily code movement, with some changes in error messages to reduce
the number of input parameters.

3 years agolib/open: reuse directory checks from n_d_c_with_config
David Bremner [Thu, 4 Mar 2021 13:31:13 +0000 (09:31 -0400)]
lib/open: reuse directory checks from n_d_c_with_config

Make checks more uniform between creating new databases and opening
existing ones.

3 years agolib/open: factor out library initialization
David Bremner [Fri, 29 Jan 2021 11:44:18 +0000 (07:44 -0400)]
lib/open: factor out library initialization

This is slightly more tidy, but more importantly it allows for re-use
of this code in n_d_create_with_config. That re-use will be crucial
when we no longer call n_d_open_with_config from
n_d_create_with_config.

3 years agolib: remove "path" from notmuch struct
David Bremner [Tue, 2 Feb 2021 20:43:58 +0000 (16:43 -0400)]
lib: remove "path" from notmuch struct

This removes duplication between the struct element and the
configuration string_map entry. Create a simple wrapper for setting
the database path that makes sure the trailing / is stripped.

3 years agolib/open: allocate notmuch_t struct early
David Bremner [Wed, 27 Jan 2021 00:46:44 +0000 (20:46 -0400)]
lib/open: allocate notmuch_t struct early

This gives more flexibility in restructuring the database opening
code.

3 years agolib/open: support NOTMUCH_DATABASE environment variable
David Bremner [Sat, 26 Dec 2020 03:22:23 +0000 (23:22 -0400)]
lib/open: support NOTMUCH_DATABASE environment variable

The additional code is trivial, but making sure we get the priority of
various options correct takes a few tests.

3 years agoCLI/show: complete conversion to new configuration framework.
David Bremner [Sat, 6 Feb 2021 22:50:20 +0000 (18:50 -0400)]
CLI/show: complete conversion to new configuration framework.

In order to open the database in main() for this command, we may need
to re-open it in the (possibly less common) case where crypto options
require write access.

3 years agoCLI/new: drop the write lock to run the pre-new hook.
David Bremner [Fri, 19 Mar 2021 01:58:02 +0000 (22:58 -0300)]
CLI/new: drop the write lock to run the pre-new hook.

This fixes a bug reported in [1]. In principle it could be possible
avoid one of these reopens, but it complicates the logic in main with
respect to creating new databases.

[1]: id:9C1993DF-84BD-4199-A9C8-BADA98498812@bubblegen.co.uk

3 years agotest: Add tests for write access to database from hooks.
David Bremner [Fri, 19 Mar 2021 01:54:13 +0000 (22:54 -0300)]
test: Add tests for write access to database from hooks.

Recent changes to configuration handling meant the pre-new hook was
run while the database was open read only, limiting what could be done
in the hook. Add some known broken tests for this problem, as well as
a regression test for write access from the post-new hook.

3 years agolib: support reopening databases for write access.
David Bremner [Sun, 14 Mar 2021 14:01:59 +0000 (11:01 -0300)]
lib: support reopening databases for write access.

In the future Xapian will apparently support this more conveniently
for the cases other than READ_ONLY => READ_ONLY

Conceptually this function seems to fit better in lib/open.cc;
database.cc is still large enough that moving the function makes
sense.

3 years agolib: save path of xapian database in notmuch struct.
David Bremner [Sun, 14 Mar 2021 14:01:58 +0000 (11:01 -0300)]
lib: save path of xapian database in notmuch struct.

This will allow re-opening in a different mode (read/write
vs. read-only) with current Xapian API. It will also prove useful when
updating the compact functions to support more flexible database
location.

3 years agolib: publish API for notmuch_database_reopen
David Bremner [Sun, 14 Mar 2021 14:01:57 +0000 (11:01 -0300)]
lib: publish API for notmuch_database_reopen

Include the (currently unused) mode argument which will specify which
mode to re-open the database in. Functionality and docs to be
finalized in a followup commit.

3 years agotest/setup: add check for config exists, but no database.
David Bremner [Sun, 14 Mar 2021 14:01:56 +0000 (11:01 -0300)]
test/setup: add check for config exists, but no database.

This code path is not currently tested, and will need updating if the
location of the xapian database changes.

3 years agotest: add known broken test for long directory bug
David Bremner [Thu, 18 Mar 2021 01:20:35 +0000 (22:20 -0300)]
test: add known broken test for long directory bug

In [1] Gregor Zattler explained the results of his hard work
tracking down a bug in notmuch with long directories. This test
duplicates the bug.

[1]: id:20210317194728.GB5561@no.workgroup

3 years agolib/open: free GKeyFile
David Bremner [Sat, 6 Mar 2021 13:49:34 +0000 (09:49 -0400)]
lib/open: free GKeyFile

This fixes a small-to-medium (depending on size of config file) memory
leak.

3 years agolib/config: free memory from traversing GKeyFile
David Bremner [Sat, 6 Mar 2021 13:49:33 +0000 (09:49 -0400)]
lib/config: free memory from traversing GKeyFile

This fixes a few small memory leaks.

3 years agolib/open: free value from g_key_file_get_value
David Bremner [Sat, 6 Mar 2021 13:49:32 +0000 (09:49 -0400)]
lib/open: free value from g_key_file_get_value

This fixes a small memory leak.

3 years agolib/open: use local talloc context in n_d_create_with_config
David Bremner [Sat, 6 Mar 2021 13:49:31 +0000 (09:49 -0400)]
lib/open: use local talloc context in n_d_create_with_config

This better matches the memory allocation semantics in
notmuch_database_open_with_config.

3 years agocli: run uncrustify
uncrustify [Sat, 13 Mar 2021 12:45:34 +0000 (08:45 -0400)]
cli: run uncrustify

This is the result of running

     $ uncrustify --replace --config devel/uncrustify.cfg *.c *.h

in the top level source directory

Line breaks were then adjusted manually to keep argc and argv
together.

3 years agotest: run uncrustify
uncrustify [Sat, 13 Mar 2021 12:45:34 +0000 (08:45 -0400)]
test: run uncrustify

This is the result of running:

    $ uncrustify --replace --config ../devel/uncrustify.cfg *.cc *.c *.h

in the test directory.

3 years agoutil: run uncrustify
uncrustify [Sat, 13 Mar 2021 12:45:34 +0000 (08:45 -0400)]
util: run uncrustify

This is the result of running

     $ uncrustify --replace --config ../devel/uncrustify.cfg *.c *.h

in the util directory

3 years agolib: run uncrustify
uncrustify [Sat, 13 Mar 2021 12:45:34 +0000 (08:45 -0400)]
lib: run uncrustify

This is the result of running

     $ uncrustify --replace --config ../devel/uncrustify.cfg *.c *.h *.cc

in the lib directory

3 years agotest: clean up some extra whitespace.
David Bremner [Sat, 16 Jan 2021 01:29:17 +0000 (21:29 -0400)]
test: clean up some extra whitespace.

The extra space is mainly just untidy.

3 years agotest: T020-compact.sh: fix work directory location
Tomi Ollila [Thu, 25 Feb 2021 20:04:30 +0000 (22:04 +0200)]
test: T020-compact.sh: fix work directory location

Fix use of $TEST_DIRECTORY ($NOTMUCH_BUILDDIR/test/) with use of
$TMP_DIRECTORY ($NOTMUCH_BUILDDIR/test/tmp.T020-compact/ in case
of T020-compact.sh) as root directory where to write test files
and directories.

3 years agodevel/uncrustify: add line length limits.
David Bremner [Sun, 7 Mar 2021 19:44:46 +0000 (15:44 -0400)]
devel/uncrustify: add line length limits.

A generous limit of 102 is chosen to moderate the amount of resulting
reformatting.

3 years agoMerge tag '0.31.4'
David Bremner [Thu, 18 Feb 2021 12:47:53 +0000 (08:47 -0400)]
Merge tag '0.31.4'

notmuch 0.31.4 release

3 years agodebian: drop patches 0.31.4 archive/debian/0.31.4-1 debian/0.31.4-1
David Bremner [Thu, 18 Feb 2021 11:53:00 +0000 (07:53 -0400)]
debian: drop patches

we should by synced up with the tarball again