[PATCH 0/6] compactor changes

diff --git a/03/b66a35988207ce026eff9d2644188eab7f6235 b/03/b66a35988207ce026eff9d2644188eab7f6235
new file mode 100644 (file)
index 0000000..ce99670
--- /dev/null
+++ b/03/b66a35988207ce026eff9d2644188eab7f6235
@@ -0,0 +1,89 @@
+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 0D257431FBC\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Nov 2013 07:27:36 -0700 (PDT)\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 laMTwDZ7RIor for <notmuch@notmuchmail.org>;\r
+       Fri,  1 Nov 2013 07:27:31 -0700 (PDT)\r
+Received: from mail-ea0-f173.google.com (mail-ea0-f173.google.com\r
+       [209.85.215.173]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id ABDF7431FAE\r
+       for <notmuch@notmuchmail.org>; Fri,  1 Nov 2013 07:27:31 -0700 (PDT)\r
+Received: by mail-ea0-f173.google.com with SMTP id g10so2093692eak.32\r
+       for <notmuch@notmuchmail.org>; Fri, 01 Nov 2013 07:27:30 -0700 (PDT)\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=LB8V6juHVnS4Pqsv8ytkxa8lYIB9GoBySQIMqlGDZ0I=;\r
+       b=dVyfYtxpi8X5lMpkurJDpbv2f5tszWzptxYNJcmhh6OEvvMJErBfzM2k8/IAcyc1Fw\r
+       wPZ2xjUPS3IMYugb4MLbYcpqgH0p3zgBQWkyQQTbxpP5CJr4I1C61hxst5Le3/0vHFU/\r
+       w89mZjb9+7dZzZTN3hjapeW2TH4THH++T4OqFj7KUZClOiL7ky80kmr0pUCdsz1fU5d5\r
+       RqU3LVMtaV11SwdiL0pM3wKG9luaXnXUcBJDcOWN9OHvmqAZf6wYzl3Ss21+rF4x1CfB\r
+       jmaymmI4wmYIz4/p/3x9w6Uq9AS9YxVbEzgJpNFz3U7+MeeeYi3BZ83EROMkbUA4oBE9\r
+       7frg==\r
+X-Gm-Message-State:\r
+ ALoCoQnLL7u7u6RhrJg+gbfvcwmrluDzJlA9JoiX29/jce28p+T7g3OZ02Bt5i8Mz+btJY6X/DiP\r
+X-Received: by 10.15.44.8 with SMTP id y8mr3533337eev.38.1383316050296;\r
+       Fri, 01 Nov 2013 07:27:30 -0700 (PDT)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPSA id e13sm8393770eeu.4.2013.11.01.07.27.28\r
+       for <multiple recipients>\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Fri, 01 Nov 2013 07:27:29 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 0/6] compactor changes\r
+Date: Fri,  1 Nov 2013 15:27:09 +0100\r
+Message-Id: <cover.1383315568.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.2.5\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: Fri, 01 Nov 2013 14:27:36 -0000\r
+\r
+David was a bit hasty with pushing compact, so I missed the\r
+review. Instead of just whining about it, here's a few changes I'd\r
+really like to see merged before release. Completely untested, needs man\r
+page updates and probably test changes too, so there's a bit more to do\r
+still. Hint, if you have the time, just pick up from here. ;)\r
+\r
+Cheers,\r
+Jani.\r
+\r
+\r
+Jani Nikula (6):\r
+  lib: construct compactor within try block to catch any exceptions\r
+  lib: add closure parameter to compact status update callback\r
+  lib: use the backup path provided by the user, don't add anything to\r
+    it\r
+  cli: return error status if compaction fails\r
+  cli: add compact --backup=FILE option, don't backup by default\r
+  cli: add compact --verbose option and silence output without it\r
+\r
+ lib/database.cc   |   29 ++++++++++++++---------------\r
+ lib/notmuch.h     |    5 +++--\r
+ notmuch-compact.c |   46 +++++++++++++++++++++++++++-------------------\r
+ 3 files changed, 44 insertions(+), 36 deletions(-)\r
+\r
+-- \r
+1.7.2.5\r
+\r