[PATCH 09/10] emacs: Improve error handling for notmuch-call-notmuch-json

diff --git a/a7/cc2d942fe273409301b48502404a73225e5a56 b/a7/cc2d942fe273409301b48502404a73225e5a56
new file mode 100644 (file)
index 0000000..9a5a9f0
--- /dev/null
+++ b/a7/cc2d942fe273409301b48502404a73225e5a56
@@ -0,0 +1,136 @@
+Return-Path: <amdragon@mit.edu>\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 08156431FBD\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Dec 2012 18:40:16 -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 a+42A1gttsWM for <notmuch@notmuchmail.org>;\r
+       Sat,  1 Dec 2012 18:40:15 -0800 (PST)\r
+Received: from dmz-mailsec-scanner-8.mit.edu (DMZ-MAILSEC-SCANNER-8.MIT.EDU\r
+       [18.7.68.37])\r
+       by olra.theworths.org (Postfix) with ESMTP id CA33A431FC3\r
+       for <notmuch@notmuchmail.org>; Sat,  1 Dec 2012 18:40:13 -0800 (PST)\r
+X-AuditID: 12074425-b7f606d0000008ea-2a-50babf8d2d00\r
+Received: from mailhub-auth-3.mit.edu ( [18.9.21.43])\r
+       by dmz-mailsec-scanner-8.mit.edu (Symantec Messaging Gateway) with SMTP\r
+       id 19.75.02282.D8FBAB05; Sat,  1 Dec 2012 21:40:13 -0500 (EST)\r
+Received: from outgoing.mit.edu (OUTGOING-AUTH.MIT.EDU [18.7.22.103])\r
+       by mailhub-auth-3.mit.edu (8.13.8/8.9.2) with ESMTP id qB22eBuO030585; \r
+       Sat, 1 Dec 2012 21:40:11 -0500\r
+Received: from drake.dyndns.org\r
+       (209-6-116-242.c3-0.arl-ubr1.sbo-arl.ma.cable.rcn.com\r
+       [209.6.116.242]) (authenticated bits=0)\r
+       (User authenticated as amdragon@ATHENA.MIT.EDU)\r
+       by outgoing.mit.edu (8.13.6/8.12.4) with ESMTP id qB22e65n025605\r
+       (version=TLSv1/SSLv3 cipher=AES256-SHA bits=256 verify=NOT);\r
+       Sat, 1 Dec 2012 21:40:10 -0500 (EST)\r
+Received: from amthrax by drake.dyndns.org with local (Exim 4.77)\r
+       (envelope-from <amdragon@mit.edu>)\r
+       id 1TezTS-0000xn-55; Sat, 01 Dec 2012 21:40:06 -0500\r
+From: Austin Clements <amdragon@MIT.EDU>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 09/10] emacs: Improve error handling for\r
+       notmuch-call-notmuch-json\r
+Date: Sat,  1 Dec 2012 21:40:01 -0500\r
+Message-Id: <1354416002-3557-9-git-send-email-amdragon@mit.edu>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+References: <1354416002-3557-1-git-send-email-amdragon@mit.edu>\r
+X-Brightmail-Tracker:\r
+ H4sIAAAAAAAAA+NgFtrAIsWRmVeSWpSXmKPExsUixCmqrdu7f1eAwcNOQYvrN2cyOzB6PFt1\r
+       izmAMYrLJiU1J7MstUjfLoEr49v2s0wFiwUrNtz/wdjAOJe3i5GDQ0LARGLZDLsuRk4gU0zi\r
+       wr31bF2MXBxCAvsYJdYfnskK4axnlJjVfpsFwnnIJLFk8z82kBYhgbmMEvfv5YLYbAIaEtv2\r
+       L2cEsUUEpCV23p3NCrKBWUBN4k+XCkhYWCBIou/XVBYQm0VAVWLPpG+sIDavgL1E05Z2Rogr\r
+       FCW6n01gA2nlFHCQWNHNA7HJXuL/72tsExj5FzAyrGKUTcmt0s1NzMwpTk3WLU5OzMtLLdK1\r
+       0MvNLNFLTSndxAgKGHYX1R2MEw4pHWIU4GBU4uGNmLMrQIg1say4MvcQoyQHk5Io75UdQCG+\r
+       pPyUyozE4oz4otKc1OJDjBIczEoivCwmQDnelMTKqtSifJiUNAeLkjjvjZSb/kIC6Yklqdmp\r
+       qQWpRTBZGQ4OJQne6n1AjYJFqempFWmZOSUIaSYOTpDhPEDDp4HU8BYXJOYWZ6ZD5E8xKkqJ\r
+       83aCJARAEhmleXC9sIh+xSgO9Iow72GQKh5gMoDrfgU0mAlo8Jtl20EGlyQipKQaGJOVBBMK\r
+       TfYoSGovuVzmbLuXuXiL1JH3H+xWaMTN6CybsbU4ZePxZQYXJB/uTmpR0tBY2hyyeGVlbJzA\r
+       H225/jv3HF+ohok8SqvPu2ZXyb6Rs1bZNPXQjPTlM2/aLfFuETLZZ3Pkw+ZbyU8ONPF9lOUt\r
+       vcRZFiHF98nlxuVTDW36k2dcdfu7XImlOCPRUIu5qDgRAE9JeV/DAgAA\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, 02 Dec 2012 02:40:16 -0000\r
+\r
+This checks for non-zero exit status and pops up an error buffer\r
+giving the exit status, the stderr, and the stdout.  Schema version\r
+mismatches are handled specially.\r
+---\r
+ emacs/notmuch-lib.el |   40 +++++++++++++++++++++++++++++++++-------\r
+ 1 file changed, 33 insertions(+), 7 deletions(-)\r
+\r
+diff --git a/emacs/notmuch-lib.el b/emacs/notmuch-lib.el\r
+index 31c69dc..9c6be13 100644\r
+--- a/emacs/notmuch-lib.el\r
++++ b/emacs/notmuch-lib.el\r
+@@ -361,15 +361,41 @@ You may need to restart Emacs or upgrade your notmuch package."))\r
+   "Invoke `notmuch-command' with `args' and return the parsed JSON output.\r
+ \r
+ The returned output will represent objects using property lists\r
+-and arrays as lists."\r
++and arrays as lists.  If notmuch exits with a non-zero status,\r
++this will pop up a buffer containing notmuch's output and signal\r
++an error."\r
+ \r
+   (with-temp-buffer\r
+-    (apply #'call-process notmuch-command nil (list t nil) nil args)\r
+-    (goto-char (point-min))\r
+-    (let ((json-object-type 'plist)\r
+-        (json-array-type 'list)\r
+-        (json-false 'nil))\r
+-      (json-read))))\r
++    (let ((err-file (make-temp-file "nmerr")))\r
++      (unwind-protect\r
++        (let ((status (apply #'call-process\r
++                             notmuch-command nil (list t err-file) nil args)))\r
++          (cond ((equal status 0)\r
++                 (goto-char (point-min))\r
++                 (let ((json-object-type 'plist)\r
++                       (json-array-type 'list)\r
++                       (json-false 'nil))\r
++                   (json-read)))\r
++                ((or (equal status 20) (equal status 21))\r
++                 ;; Special handling of version mismatch errors\r
++                 (notmuch-version-mismatch-error status))\r
++                (t\r
++                 (goto-char (point-min))\r
++                 (insert "Error:\n")\r
++                 (let ((pos (point)))\r
++                   (insert-file-contents err-file)\r
++                   (when (= (point) pos)\r
++                     (insert "(no error output)\n")))\r
++                 (unless (eobp)\r
++                   (insert "Output:\n"))\r
++                 (notmuch-pop-up-error\r
++                  (concat\r
++                   (format "CLI error.  %S exited with %s%s.\n"\r
++                           (cons notmuch-command args)\r
++                           (if (integerp status) "status " "")\r
++                           status)\r
++                   (buffer-string))))))\r
++      (delete-file err-file)))))\r
+ \r
+ ;; Compatibility functions for versions of emacs before emacs 23.\r
+ ;;\r
+-- \r
+1.7.10.4\r
+\r