Re: [RFC PATCH v2 1/3] cli: notmuch-show changes to support pick

diff --git a/1a/169fcc0ce8eeda32170e780fb6882d8f856480 b/1a/169fcc0ce8eeda32170e780fb6882d8f856480
new file mode 100644 (file)
index 0000000..ec86782
--- /dev/null
+++ b/1a/169fcc0ce8eeda32170e780fb6882d8f856480
@@ -0,0 +1,141 @@
+Return-Path: <daniel@schoepe.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 3938B429E59\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:28 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.8\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.8 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       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 A2Sm8kgBmrMK for <notmuch@notmuchmail.org>;\r
+       Sun, 12 Feb 2012 13:08:27 -0800 (PST)\r
+Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com\r
+       [209.85.215.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 6C543431FAE\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:27 -0800 (PST)\r
+Received: by eaak14 with SMTP id k14so2263402eaa.26\r
+       for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:26 -0800 (PST)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=schoepe.org; s=google;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type;\r
+       bh=5ZpiAUAc7oaGV9FdhiLll/IDiV6pAuMryII/gJb6bdA=;\r
+       b=WowLECwSepLtAKfxLbCCscHGxLR6xmV9CdSrmb4Ur9PBYmUoAeMDBCXPZpxrGADGGE\r
+       ITIkiJol1C5g3yWLG5zM6zl5goHjXU43o92ePxfB7reeJXJq+XpkkqTpOwonHQ65tZ8F\r
+       JJtIwooIk6M+O1AfcJ67S28aS08Rq90xtzQyA=\r
+Received: by 10.14.28.16 with SMTP id f16mr4451290eea.121.1329080906052;\r
+       Sun, 12 Feb 2012 13:08:26 -0800 (PST)\r
+Received: from localhost (dslb-088-069-141-163.pools.arcor-ip.net.\r
+       [88.69.141.163])\r
+       by mx.google.com with ESMTPS id z47sm52925004eeh.9.2012.02.12.13.08.24\r
+       (version=TLSv1/SSLv3 cipher=OTHER);\r
+       Sun, 12 Feb 2012 13:08:25 -0800 (PST)\r
+From: Daniel Schoepe <daniel@schoepe.org>\r
+To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [RFC PATCH v2 1/3] cli: notmuch-show changes to support pick\r
+In-Reply-To: <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>\r
+References: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
+       <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>\r
+User-Agent: Notmuch/0.11.1+191~gb324ce8 (http://notmuchmail.org)\r
+       Emacs/24.0.93.1 (x86_64-pc-linux-gnu)\r
+Date: Sun, 12 Feb 2012 22:08:23 +0100\r
+Message-ID: <874nuvu5dk.fsf@schoepe.localhost>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; boundary="=-=-=";\r
+       micalg=pgp-sha1; protocol="application/pgp-signature"\r
+X-Gm-Message-State:\r
+ ALoCoQkrOoCPy6nMP3ogXfdoEZrkrxAD0a34Iz2ZkyyHo0FMiBLeYuSweLhpkeKMDdg6eQL3lAL7\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, 12 Feb 2012 21:08:28 -0000\r
+\r
+--=-=-=\r
+Content-Type: text/plain\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Sun, 12 Feb 2012 18:49:37 +0000, Mark Walters <markwalters1009@gmail.com=\r
+> wrote:\r
+> +    int opt_index, ret, entire_thread;\r
+> +    notmuch_sort_t sort =3D NOTMUCH_SORT_NEWEST_FIRST;\r
+>      const notmuch_show_format_t *format =3D &format_text;\r
+>      notmuch_show_params_t params =3D { .part =3D -1 };\r
+>      int format_sel =3D NOTMUCH_FORMAT_NOT_SPECIFIED;\r
+>      notmuch_bool_t verify =3D FALSE;\r
+> +    notmuch_bool_t headers_only =3D FALSE;\r
+>=20=20\r
+>      notmuch_opt_desc_t options[] =3D {\r
+>      { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
+> @@ -1042,10 +1093,19 @@ notmuch_show_command (void *ctx, unused (int argc=\r
+), unused (char *argv[]))\r
+>                                { "mbox", NOTMUCH_FORMAT_MBOX },\r
+>                                { "raw", NOTMUCH_FORMAT_RAW },\r
+>                                { 0, 0 } } },\r
+> +    { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',\r
+> +      (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },\r
+> +                              { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },\r
+> +                              { 0, 0 } } },\r
+>      { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
+> -    { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
+> +    { NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',\r
+> +      (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },\r
+> +                              { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },\r
+> +                              { "none", NOTMUCH_SHOW_THREAD_NONE },\r
+> +                              { 0, 0 } } },\r
+>      { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
+>      { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
+> +    { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },\r
+>      { 0, 0, 0, 0, 0 }\r
+>      };\r
+>=20=20\r
+> @@ -1055,6 +1115,9 @@ notmuch_show_command (void *ctx, unused (int argc),=\r
+ unused (char *argv[]))\r
+>      return 1;\r
+>      }\r
+>=20=20\r
+> +    params.entire_thread =3D entire_thread;\r
+\r
+entire_thread is not initialized here, if there is no --thread\r
+argument. The rest of the code makes this result in the same behavior as\r
+=2D-thread=3Dentire, but it should be initialized to\r
+NOTMUCH_SHOW_THREAD_MATCH.\r
+\r
+Cheers,\r
+Daniel\r
+\r
+--=-=-=\r
+Content-Type: application/pgp-signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v1.4.11 (GNU/Linux)\r
+\r
+iQIcBAEBAgAGBQJPOCpHAAoJEIaTAtce+Z+JV2IP/Asg3lM8LpIR4h4Bk66dtQ24\r
+xqs8Qs2vioLAdxzdMgfwyMDuQnarw4LJUuOicVp22cYOI6Asu/oDatvW7La2yWvr\r
+hz/kCkyV5XBGAVkcme+CPfv/cJT7sxwpw49IpFYnCzVGgk8Y61MMWBNF0RkAfwnz\r
+6OgKiTLYZ8KBlJS+5+095cv6uHaK983L3qkRsxT9V51az/gSzOde+MGJSrXI6C2W\r
+eoJ6rKVEjjWUfr2/Oi9F03XrKPiDIxovFPnhDEnQh43RpRveEX6FXfDSv4cCLdC5\r
+t5lF70mnBnvcrwRYz2Guqt0DlYtgNzGYTK/IzaBEIOKecvIWpOLqrR/aMiu4cJQJ\r
+Bcn46NnLJ/2zdODMfVvtNm+jGQ3sbITcBoRyhW7C5H3uMl9ItUTVPTpszUuPct+d\r
+XrBpdbrhoAqwVkpSs3IaGyUKcZrdN+/TKk9zQi9f0b8uYFe7Q0bmk2czha4JQijH\r
+VUrMZGkarUcAro6ZCy+pRdeoD+aTZFaSUvlJnhqCJqWZRuxmPc8waMMFj3RbZzGA\r
+EdEIjQLM4Y99icFSj6524I2GmOKFyX8H8W8UFMnfOx9j/knT7ThjAPPg2awUdRLG\r
+rqASaarAZupzOn/xag4V0hKyvYPPt1ziyZJY3Jd+X0HHV7f80mJX/ewgzMWv4CrF\r
+Z4Rn2rZLDr7+wLOEtubq\r
+=zSj/\r
+-----END PGP SIGNATURE-----\r
+--=-=-=--\r