[PATCH v2 00/11] compactor changes v2

diff --git a/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a b/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a
new file mode 100644 (file)
index 0000000..9105b57
--- /dev/null
+++ b/4a/f5ed7e1ef21bfdb71264a78764e5415c5e142a
@@ -0,0 +1,100 @@
+Return-Path: <jani@nikula.org>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+       by olra.theworths.org (Postfix) with ESMTP id 19203431FDB\r
+       for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:25:07 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.7\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5\r
+       tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
+Received: from olra.theworths.org ([127.0.0.1])\r
+       by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
+       with ESMTP id y7AHbm1m-zy4 for <notmuch@notmuchmail.org>;\r
+       Sun,  3 Nov 2013 04:24:57 -0800 (PST)\r
+Received: from mail-ee0-f45.google.com (mail-ee0-f45.google.com\r
+ [74.125.83.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ CE5E2431FAF   for <notmuch@notmuchmail.org>; Sun,  3 Nov 2013 04:24:56 -0800\r
+ (PST)\r
+Received: by mail-ee0-f45.google.com with SMTP id e50so584512eek.18\r
+       for <notmuch@notmuchmail.org>; Sun, 03 Nov 2013 04:24:55 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id;\r
+       bh=HEg6UewcKFHDdA8sTEbIDv2k/f4WU/6epNSZBZA6GIo=;\r
+       b=UFWTali1Tnw2KIeDLAa24SmsEzCEz4IgBlEbCyRQ0Kfx6xH/EB3eidmZfDQImq+1uB\r
+       wNrNKDt5g3lQUr74U+n8806XmxVOYmv8gtxODorbsFijYMfH3zlju++CdspczuU2sg0k\r
+       gGZ23jq6RjhaHvleausLfKMNuJ05EgxiOZOBgh19GKr5wFbyHji/Csoz5tPNLIkzN9BC\r
+       bWMssYNxb1m9BsY+Ir+PiPVJBRaPJCLiePcfase+Lcyhw+usTkTupPsKGrHK8L4m6OZX\r
+       qo5s59bovdu1KR/a53JixFHg4aD6lOdI90t/FVVii6tCLz2v4VBZE5zoh93r9oURf9Tg\r
+       ptqg==\r
+X-Gm-Message-State:\r
+ ALoCoQmyQerohIjL2SHG7puIePWIP6fP142T3lT+YzMclSDw8c2tSSsvOCi/mwCghzIrj21NTT3F\r
+X-Received: by 10.14.108.9 with SMTP id p9mr12700625eeg.8.1383481494039;\r
+       Sun, 03 Nov 2013 04:24:54 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id d7sm32824419eem.8.2013.11.03.04.24.52\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 03 Nov 2013 04:24:53 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v2 00/11] compactor changes v2\r
+Date: Sun,  3 Nov 2013 14:24:40 +0200\r
+Message-Id: <cover.1383481295.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.4.rc3\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.13\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+       <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
+List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
+List-Post: <mailto:notmuch@notmuchmail.org>\r
+List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
+List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
+       <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 03 Nov 2013 12:25:07 -0000\r
+\r
+Hi all, this is v2 of [1], incorporating compact related patches from\r
+David, some changes from David's review, some new patches, man page\r
+update, test update.\r
+\r
+Cheers,\r
+Jani.\r
+\r
+\r
+[1] id:cover.1383315568.git.jani@nikula.org\r
+\r
+\r
+David Bremner (2):\r
+  test: fix compact backup / restore test\r
+  lib: update documentation of callback functions for database_compact\r
+    and database_upgrade.\r
+\r
+Jani Nikula (9):\r
+  lib: construct compactor within try block to catch any exceptions\r
+  lib: check talloc success in compact\r
+  lib: do not leak the database in compaction\r
+  lib: add closure parameter to compact status update callback\r
+  lib: use the compaction backup path provided by the caller\r
+  cli: return error status if compaction fails\r
+  cli: add compact --backup=DIRECTORY option, don't backup by default\r
+  cli: add compact --verbose option and silence output without it\r
+  man: document notmuch compact --verbose and --backup=DIRECTORY options\r
+\r
+ lib/database.cc            | 41 +++++++++++++++++++++++------------------\r
+ lib/notmuch.h              | 11 ++++++++---\r
+ man/man1/notmuch-compact.1 | 28 +++++++++++++++++++++++++++-\r
+ notmuch-compact.c          | 46 +++++++++++++++++++++++++++-------------------\r
+ test/compact               |  9 +++++----\r
+ 5 files changed, 90 insertions(+), 45 deletions(-)\r
+\r
+-- \r
+1.8.4.rc3\r
+\r