[PATCH] remove prefixes from `--output={threads,messages}' results

diff --git a/a4/d38ff1c09012fd6631198653180871cea3f9fb b/a4/d38ff1c09012fd6631198653180871cea3f9fb
new file mode 100644 (file)
index 0000000..ddb2a71
--- /dev/null
+++ b/a4/d38ff1c09012fd6631198653180871cea3f9fb
@@ -0,0 +1,103 @@
+Return-Path: <pieter@praet.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 2E2A141ED86\r
+       for <notmuch@notmuchmail.org>; Thu, 30 Jun 2011 01:20:03 -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 sePaj6OrL1pe for <notmuch@notmuchmail.org>;\r
+       Thu, 30 Jun 2011 01:20:01 -0700 (PDT)\r
+Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com\r
+ [74.125.82.45])       (using TLSv1 with cipher RC4-SHA (128/128 bits))        (No client\r
+ certificate requested)        by olra.theworths.org (Postfix) with ESMTPS id\r
+ D5BD342119F   for <notmuch@notmuchmail.org>; Thu, 30 Jun 2011 01:20:00 -0700\r
+ (PDT)\r
+Received: by wwj40 with SMTP id 40so1625697wwj.2\r
+       for <notmuch@notmuchmail.org>; Thu, 30 Jun 2011 01:19:59 -0700 (PDT)\r
+Received: by 10.216.79.74 with SMTP id h52mr1717392wee.33.1309421999624;\r
+       Thu, 30 Jun 2011 01:19:59 -0700 (PDT)\r
+Received: from localhost ([109.131.21.173])\r
+       by mx.google.com with ESMTPS id w58sm1001748weq.1.2011.06.30.01.19.57\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Thu, 30 Jun 2011 01:19:58 -0700 (PDT)\r
+From: Pieter Praet <pieter@praet.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH] remove prefixes from `--output={threads,messages}' results\r
+Date: Thu, 30 Jun 2011 10:19:49 +0200\r
+Message-Id: <1309421989-22410-1-git-send-email-pieter@praet.org>\r
+X-Mailer: git-send-email 1.7.4.1\r
+In-Reply-To: <877hbiep5g.fsf@SSpaeth.de>\r
+References: <877hbiep5g.fsf@SSpaeth.de>\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, 30 Jun 2011 08:20:03 -0000\r
+\r
+Alter `do_search_threads()' and `do_search_messages()'\r
+to not prepend each result with `thread:' respectively `id:'.\r
+\r
+This makes its output consistent with `do_search_tags()'.\r
+\r
+See this discussion: id:"871v6b79s0.fsf@yoom.home.cworth.org"\r
+\r
+########################################################################\r
+\r
+NOTE:\r
+\r
+I started adjusting the tests as well, but stopped fairly quickly since\r
+the amount is simply *ludicrous*. Only 9 tests fail initially, but start\r
+ripping out `notmuch_search_sanitize' (as would be sensible) and you'll\r
+see what I mean.\r
+\r
+Time isn't the issue (sed flies through it faster than Windoze can BSOD),\r
+but the patch will be so huge and disruptive that even Ubuntu devs might\r
+consider frowning disapprovingly.\r
+\r
+########################################################################\r
+\r
+Signed-off-by: Pieter Praet <pieter@praet.org>\r
+---\r
+ notmuch-search.c |    4 ++--\r
+ 1 files changed, 2 insertions(+), 2 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index faccaf7..c565ae6 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -220,7 +220,7 @@ do_search_threads (const search_format_t *format,\r
+       thread = notmuch_threads_get (threads);\r
+ \r
+       if (output == OUTPUT_THREADS) {\r
+-          format->item_id (thread, "thread:",\r
++          format->item_id (thread, "",\r
+                            notmuch_thread_get_thread_id (thread));\r
+       } else { /* output == OUTPUT_SUMMARY */\r
+           fputs (format->item_start, stdout);\r
+@@ -312,7 +312,7 @@ do_search_messages (const search_format_t *format,\r
+           if (! first_message)\r
+               fputs (format->item_sep, stdout);\r
+ \r
+-          format->item_id (message, "id:",\r
++          format->item_id (message, "",\r
+                            notmuch_message_get_message_id (message));\r
+           first_message = 0;\r
+       }\r
+-- \r
+1.7.4.1\r
+\r