Re: [PATCH 1/3] cli: add insert --must-index option

diff --git a/e0/52542190859403ecf174032785ed0d631985e4 b/e0/52542190859403ecf174032785ed0d631985e4
new file mode 100644 (file)
index 0000000..5ea6859
--- /dev/null
+++ b/e0/52542190859403ecf174032785ed0d631985e4
@@ -0,0 +1,131 @@
+Return-Path: <tomi.ollila@iki.fi>\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 4FB3A431FBD\r
+       for <notmuch@notmuchmail.org>; Thu, 10 Oct 2013 05:30:55 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 xkUp3OYO8RUd for <notmuch@notmuchmail.org>;\r
+       Thu, 10 Oct 2013 05:30:49 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id CA038431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 10 Oct 2013 05:30:48 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 37B36100030;\r
+       Thu, 10 Oct 2013 15:30:44 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH 1/3] cli: add insert --must-index option\r
+In-Reply-To: <87zjqhv264.fsf@zancas.localnet>\r
+References: <1374365254-13227-1-git-send-email-novalazy@gmail.com>\r
+       <87ip048gbj.fsf@qmul.ac.uk>\r
+       <20130727151510.GA13750@hili.localdomain>\r
+       <87hadtxfrr.fsf@qmul.ac.uk>\r
+       <20130912001349.GA18821@hili.localdomain>\r
+       <87zjqhv264.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.16+87~g451fefe (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+       $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+       !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Thu, 10 Oct 2013 15:30:44 +0300\r
+Message-ID: <m238o9fguj.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch@notmuchmail.org\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: Thu, 10 Oct 2013 12:30:55 -0000\r
+\r
+On Thu, Oct 10 2013, David Bremner <david@tethera.net> wrote:\r
+\r
+> Peter Wang <novalazy@gmail.com> writes:\r
+>\r
+>> On Tue, 10 Sep 2013 09:06:00 +0100, Mark Walters <markwalters1009@gmail.com> wrote:\r
+>>> \r
+>>> Alternatively maybe add notmuch_database_destroy_with_flush or something\r
+>>> which does give a return value. notmuch_database_close is only called 3\r
+>>> times and notmuch_database_destroy lots of times so changing close is\r
+>>> much less intrusive than changing destroy. But I don't know whether we\r
+>>> would break any  bindings or external programs etc.\r
+>>> \r
+>>> What do you think?\r
+>>\r
+>> I think notmuch_database_close and notmuch_database_destroy should\r
+>> return the status, and we update the three language bindings\r
+>> and bump the soname.\r
+>>\r
+>\r
+> I'm not opposed to doing an SONAME bump for 0.17. Are there other ABI\r
+> breaking changes that we have been holding back on? Can these maybe go\r
+> through at the same time?\r
+\r
+Maybe something along these lines...\r
+\r
+(Quick draft for the API part; to start discussion before working too much\r
+for something that is going to be dropped...)\r
+\r
+diff --git a/lib/notmuch.h b/lib/notmuch.h\r
+index 9dab555..ae52dab 100644\r
+--- a/lib/notmuch.h\r
++++ b/lib/notmuch.h\r
+@@ -106,6 +106,17 @@ typedef enum _notmuch_status {\r
+     NOTMUCH_STATUS_LAST_STATUS\r
+ } notmuch_status_t;\r
+ \r
++/* Structure to provide logging interface to the notmuch library\r
++ *\r
++ * ...\r
++ */\r
++\r
++typedef struct _notmuch_loghook {\r
++    void (*func)(struct _notmuch_loghook *, int level, int status,\r
++               const char * format, ...);\r
++} notmuch_loghook_t;\r
++\r
++\r
+ /* Get a string representation of a notmuch_status_t value.\r
+  *\r
+  * The result is read-only.\r
+@@ -159,7 +170,9 @@ typedef struct _notmuch_filenames notmuch_filenames_t;\r
+  * NOTMUCH_STATUS_XAPIAN_EXCEPTION: A Xapian exception occurred.\r
+  */\r
+ notmuch_status_t\r
+-notmuch_database_create (const char *path, notmuch_database_t **database);\r
++notmuch_database_create (const char *path,\r
++                       notmuch_loghook_t *loghook,\r
++                       notmuch_database_t **database);\r
+ \r
+ typedef enum {\r
+     NOTMUCH_DATABASE_MODE_READ_ONLY = 0,\r
+@@ -200,6 +213,7 @@ typedef enum {\r
+ notmuch_status_t\r
+ notmuch_database_open (const char *path,\r
+                      notmuch_database_mode_t mode,\r
++                     notmuch_loghook_t *loghook,\r
+                      notmuch_database_t **database);\r
+ \r
+ /* Close the given notmuch database.\r
+\r
+>\r
+> d\r
+\r
+Tomi\r
+\r