[PATCH v5 0/4] Reply enhancements (was: quoting HTML email ...)

diff --git a/41/de649d24a2184e040a84de72bf4206cd82d55b b/41/de649d24a2184e040a84de72bf4206cd82d55b
new file mode 100644 (file)
index 0000000..dd8407a
--- /dev/null
+++ b/41/de649d24a2184e040a84de72bf4206cd82d55b
@@ -0,0 +1,109 @@
+Return-Path: <awg@lagos.xvx.ca>\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 38A28431FBF\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:00:43 -0800 (PST)\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 YmFy0ZYQv4Lh for <notmuch@notmuchmail.org>;\r
+       Tue, 14 Feb 2012 21:00:42 -0800 (PST)\r
+Received: from smtp-out-04.shaw.ca (smtp-out-04.shaw.ca [64.59.134.12])\r
+       by olra.theworths.org (Postfix) with ESMTP id 6E57E431FBD\r
+       for <notmuch@notmuchmail.org>; Tue, 14 Feb 2012 21:00:42 -0800 (PST)\r
+Received: from lb7f8hsrpno-svcs.dcs.int.inet (HELO pd5ml3no-ssvc.prod.shaw.ca)\r
+       ([10.0.144.222])\r
+       by pd5mo1no-svcs.prod.shaw.ca with ESMTP; 14 Feb 2012 22:00:41 -0700\r
+X-Cloudmark-SP-Filtered: true\r
+X-Cloudmark-SP-Result: v=1.1 cv=TH029eDfZHqIRue7hhxWRjZ7JL4S9vo/jJY5vkv2d5E=\r
+       c=1 sm=1\r
+       a=oz4yHJstQ4QA:10 a=BLceEmwcHowA:10 a=yQp6g8lIsgqumF79BAsFDg==:17\r
+       a=y3FsA9EK9nUvDaqFHiAA:9 a=ez9Q0DsB6V5r5XYGvRMA:7 a=odvB31Xb1hMA:10\r
+       a=HpAAvcLHHh0Zw7uRqdWCyQ==:117\r
+Received: from unknown (HELO lagos.xvx.ca) ([96.52.216.56])\r
+       by pd5ml3no-dmz.prod.shaw.ca with ESMTP; 14 Feb 2012 22:00:41 -0700\r
+Received: by lagos.xvx.ca (Postfix, from userid 1000)\r
+       id 546118004EBA; Tue, 14 Feb 2012 22:00:40 -0700 (MST)\r
+From: Adam Wolfe Gordon <awg+notmuch@xvx.ca>\r
+To: notmuch@notmuchmail.org,\r
+       amdragon@mit.edu\r
+Subject: [PATCH v5 0/4] Reply enhancements (was: quoting HTML email ...)\r
+Date: Tue, 14 Feb 2012 22:00:23 -0700\r
+Message-Id: <1329282027-29457-1-git-send-email-awg+notmuch@xvx.ca>\r
+X-Mailer: git-send-email 1.7.5.4\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: Wed, 15 Feb 2012 05:00:43 -0000\r
+\r
+Hi everyone,\r
+\r
+There are relatively few changes from the last version [1], but the JSON\r
+format has big changes again. A summary of all the changes:\r
+\r
+* The JSON reply format now uses the new formatter from the show JSON\r
+  format. This means that the MUA will not need to call notmuch show\r
+  for text/* parts, except HTML, as the content of those parts will be\r
+  included in the JSON output.\r
+\r
+* The JSON reply format has changed in a few other minor ways, due to\r
+  reusing the show code.\r
+\r
+* Because the original message is now included in the reply format, the\r
+  old show behavior of --format=json implies --entire-thread is reinstated.\r
+  I still think this is a weird behavior, but there's no good reason to\r
+  change it.\r
+\r
+* The emacs code is simplified a bit by the changes to the JSON format, but\r
+  its behavior is basically the same.\r
+\r
+* Man pages and tests changed to reflect the above changes.\r
+\r
+Note that, as implied above, this series relies on Austin's rewrite of the\r
+show JSON formatter [2]. I should probably add the reply JSON format to\r
+the devel/schemata file, but I'll leave that for another patch (perhaps\r
+in a series with a news entry if this is deemed ready to push).\r
+\r
+Thanks to everyone for the replies on previous versions, and please let\r
+me know if you have any comments. Also, it would be great if others can\r
+test this out on some interesting messages, as my email collection is\r
+not very esoteric.\r
+\r
+[1] id:"1328746916-25447-1-git-send-email-awg+notmuch@xvx.ca"\r
+[2] id:"1329240823-7856-1-git-send-email-amdragon@mit.edu"\r
+\r
+Adam Wolfe Gordon (4):\r
+  test: Add broken test for the new JSON reply format.\r
+  reply: Add a JSON reply format.\r
+  man: Update notmuch-reply man page for JSON format.\r
+  emacs: Use the new JSON reply format and message-cite-original\r
+\r
+ emacs/notmuch-lib.el     |   39 +++++++++++\r
+ emacs/notmuch-mua.el     |  123 +++++++++++++++++++++++++----------\r
+ emacs/notmuch-show.el    |   24 +------\r
+ man/man1/notmuch-reply.1 |    5 ++\r
+ notmuch-client.h         |    3 +\r
+ notmuch-reply.c          |  164 ++++++++++++++++++++++++++++++++++------------\r
+ notmuch-show.c           |    2 +-\r
+ test/emacs               |  101 ++++++++++++++++++++++++++++-\r
+ test/multipart           |   51 +++++++++++++++++++++++++++++++++++++++++++++++++++\r
+ 9 files changed, 365 insertions(+), 103 deletions(-)\r
+\r
+-- \r
+1.7.5.4\r
+\r