1a/169fcc0ce8eeda32170e780fb6882d8f856480

   1 Return-Path: <daniel@schoepe.org>\r
   2 X-Original-To: notmuch@notmuchmail.org\r
   3 Delivered-To: notmuch@notmuchmail.org\r
   4 Received: from localhost (localhost [127.0.0.1])\r
   5         by olra.theworths.org (Postfix) with ESMTP id 3938B429E59\r
   6         for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:28 -0800 (PST)\r
   7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
   8 X-Spam-Flag: NO\r
   9 X-Spam-Score: -0.8\r
  10 X-Spam-Level: \r
  11 X-Spam-Status: No, score=-0.8 tagged_above=-999 required=5\r
  12         tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
  13         RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled\r
  14 Received: from olra.theworths.org ([127.0.0.1])\r
  15         by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)\r
  16         with ESMTP id A2Sm8kgBmrMK for <notmuch@notmuchmail.org>;\r
  17         Sun, 12 Feb 2012 13:08:27 -0800 (PST)\r
  18 Received: from mail-ey0-f181.google.com (mail-ey0-f181.google.com\r
  19         [209.85.215.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
  20         (No client certificate requested)\r
  21         by olra.theworths.org (Postfix) with ESMTPS id 6C543431FAE\r
  22         for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:27 -0800 (PST)\r
  23 Received: by eaak14 with SMTP id k14so2263402eaa.26\r
  24         for <notmuch@notmuchmail.org>; Sun, 12 Feb 2012 13:08:26 -0800 (PST)\r
  25 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=schoepe.org; s=google;\r
  26         h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
  27         :mime-version:content-type;\r
  28         bh=5ZpiAUAc7oaGV9FdhiLll/IDiV6pAuMryII/gJb6bdA=;\r
  29         b=WowLECwSepLtAKfxLbCCscHGxLR6xmV9CdSrmb4Ur9PBYmUoAeMDBCXPZpxrGADGGE\r
  30         ITIkiJol1C5g3yWLG5zM6zl5goHjXU43o92ePxfB7reeJXJq+XpkkqTpOwonHQ65tZ8F\r
  31         JJtIwooIk6M+O1AfcJ67S28aS08Rq90xtzQyA=\r
  32 Received: by 10.14.28.16 with SMTP id f16mr4451290eea.121.1329080906052;\r
  33         Sun, 12 Feb 2012 13:08:26 -0800 (PST)\r
  34 Received: from localhost (dslb-088-069-141-163.pools.arcor-ip.net.\r
  35         [88.69.141.163])\r
  36         by mx.google.com with ESMTPS id z47sm52925004eeh.9.2012.02.12.13.08.24\r
  37         (version=TLSv1/SSLv3 cipher=OTHER);\r
  38         Sun, 12 Feb 2012 13:08:25 -0800 (PST)\r
  39 From: Daniel Schoepe <daniel@schoepe.org>\r
  40 To: Mark Walters <markwalters1009@gmail.com>, notmuch@notmuchmail.org\r
  41 Subject: Re: [RFC PATCH v2 1/3] cli: notmuch-show changes to support pick\r
  42 In-Reply-To: <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>\r
  43 References: <1329072579-27340-1-git-send-email-markwalters1009@gmail.com>\r
  44         <1329072579-27340-2-git-send-email-markwalters1009@gmail.com>\r
  45 User-Agent: Notmuch/0.11.1+191~gb324ce8 (http://notmuchmail.org)\r
  46         Emacs/24.0.93.1 (x86_64-pc-linux-gnu)\r
  47 Date: Sun, 12 Feb 2012 22:08:23 +0100\r
  48 Message-ID: <874nuvu5dk.fsf@schoepe.localhost>\r
  49 MIME-Version: 1.0\r
  50 Content-Type: multipart/signed; boundary="=-=-=";\r
  51         micalg=pgp-sha1; protocol="application/pgp-signature"\r
  52 X-Gm-Message-State:\r
  53  ALoCoQkrOoCPy6nMP3ogXfdoEZrkrxAD0a34Iz2ZkyyHo0FMiBLeYuSweLhpkeKMDdg6eQL3lAL7\r
  54 X-BeenThere: notmuch@notmuchmail.org\r
  55 X-Mailman-Version: 2.1.13\r
  56 Precedence: list\r
  57 List-Id: "Use and development of the notmuch mail system."\r
  58         <notmuch.notmuchmail.org>\r
  59 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,\r
  60         <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>\r
  61 List-Archive: <http://notmuchmail.org/pipermail/notmuch>\r
  62 List-Post: <mailto:notmuch@notmuchmail.org>\r
  63 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>\r
  64 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,\r
  65         <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
  66 X-List-Received-Date: Sun, 12 Feb 2012 21:08:28 -0000\r
  67 \r
  68 --=-=-=\r
  69 Content-Type: text/plain\r
  70 Content-Transfer-Encoding: quoted-printable\r
  71 \r
  72 On Sun, 12 Feb 2012 18:49:37 +0000, Mark Walters <markwalters1009@gmail.com=\r
  73 > wrote:\r
  74 > +    int opt_index, ret, entire_thread;\r
  75 > +    notmuch_sort_t sort =3D NOTMUCH_SORT_NEWEST_FIRST;\r
  76 >      const notmuch_show_format_t *format =3D &format_text;\r
  77 >      notmuch_show_params_t params =3D { .part =3D -1 };\r
  78 >      int format_sel =3D NOTMUCH_FORMAT_NOT_SPECIFIED;\r
  79 >      notmuch_bool_t verify =3D FALSE;\r
  80 > +    notmuch_bool_t headers_only =3D FALSE;\r
  81 >=20=20\r
  82 >      notmuch_opt_desc_t options[] =3D {\r
  83 >       { NOTMUCH_OPT_KEYWORD, &format_sel, "format", 'f',\r
  84 > @@ -1042,10 +1093,19 @@ notmuch_show_command (void *ctx, unused (int argc=\r
  85 ), unused (char *argv[]))\r
  86 >                                 { "mbox", NOTMUCH_FORMAT_MBOX },\r
  87 >                                 { "raw", NOTMUCH_FORMAT_RAW },\r
  88 >                                 { 0, 0 } } },\r
  89 > +     { NOTMUCH_OPT_KEYWORD, &sort, "sort", 's',\r
  90 > +       (notmuch_keyword_t []){ { "oldest-first", NOTMUCH_SORT_OLDEST_FIRST },\r
  91 > +                               { "newest-first", NOTMUCH_SORT_NEWEST_FIRST },\r
  92 > +                               { 0, 0 } } },\r
  93 >       { NOTMUCH_OPT_INT, &params.part, "part", 'p', 0 },\r
  94 > -     { NOTMUCH_OPT_BOOLEAN, &params.entire_thread, "entire-thread", 't', 0 },\r
  95 > +     { NOTMUCH_OPT_KEYWORD, &entire_thread, "thread", 't',\r
  96 > +       (notmuch_keyword_t []){ { "match", NOTMUCH_SHOW_THREAD_MATCH, },\r
  97 > +                               { "entire", NOTMUCH_SHOW_THREAD_ENTIRE },\r
  98 > +                               { "none", NOTMUCH_SHOW_THREAD_NONE },\r
  99 > +                               { 0, 0 } } },\r
 100 >       { NOTMUCH_OPT_BOOLEAN, &params.decrypt, "decrypt", 'd', 0 },\r
 101 >       { NOTMUCH_OPT_BOOLEAN, &verify, "verify", 'v', 0 },\r
 102 > +     { NOTMUCH_OPT_BOOLEAN, &headers_only, "headers-only", 'h', 0 },\r
 103 >       { 0, 0, 0, 0, 0 }\r
 104 >      };\r
 105 >=20=20\r
 106 > @@ -1055,6 +1115,9 @@ notmuch_show_command (void *ctx, unused (int argc),=\r
 107  unused (char *argv[]))\r
 108 >       return 1;\r
 109 >      }\r
 110 >=20=20\r
 111 > +    params.entire_thread =3D entire_thread;\r
 112 \r
 113 entire_thread is not initialized here, if there is no --thread\r
 114 argument. The rest of the code makes this result in the same behavior as\r
 115 =2D-thread=3Dentire, but it should be initialized to\r
 116 NOTMUCH_SHOW_THREAD_MATCH.\r
 117 \r
 118 Cheers,\r
 119 Daniel\r
 120 \r
 121 --=-=-=\r
 122 Content-Type: application/pgp-signature\r
 123 \r
 124 -----BEGIN PGP SIGNATURE-----\r
 125 Version: GnuPG v1.4.11 (GNU/Linux)\r
 126 \r
 127 iQIcBAEBAgAGBQJPOCpHAAoJEIaTAtce+Z+JV2IP/Asg3lM8LpIR4h4Bk66dtQ24\r
 128 xqs8Qs2vioLAdxzdMgfwyMDuQnarw4LJUuOicVp22cYOI6Asu/oDatvW7La2yWvr\r
 129 hz/kCkyV5XBGAVkcme+CPfv/cJT7sxwpw49IpFYnCzVGgk8Y61MMWBNF0RkAfwnz\r
 130 6OgKiTLYZ8KBlJS+5+095cv6uHaK983L3qkRsxT9V51az/gSzOde+MGJSrXI6C2W\r
 131 eoJ6rKVEjjWUfr2/Oi9F03XrKPiDIxovFPnhDEnQh43RpRveEX6FXfDSv4cCLdC5\r
 132 t5lF70mnBnvcrwRYz2Guqt0DlYtgNzGYTK/IzaBEIOKecvIWpOLqrR/aMiu4cJQJ\r
 133 Bcn46NnLJ/2zdODMfVvtNm+jGQ3sbITcBoRyhW7C5H3uMl9ItUTVPTpszUuPct+d\r
 134 XrBpdbrhoAqwVkpSs3IaGyUKcZrdN+/TKk9zQi9f0b8uYFe7Q0bmk2czha4JQijH\r
 135 VUrMZGkarUcAro6ZCy+pRdeoD+aTZFaSUvlJnhqCJqWZRuxmPc8waMMFj3RbZzGA\r
 136 EdEIjQLM4Y99icFSj6524I2GmOKFyX8H8W8UFMnfOx9j/knT7ThjAPPg2awUdRLG\r
 137 rqASaarAZupzOn/xag4V0hKyvYPPt1ziyZJY3Jd+X0HHV7f80mJX/ewgzMWv4CrF\r
 138 Z4Rn2rZLDr7+wLOEtubq\r
 139 =zSj/\r
 140 -----END PGP SIGNATURE-----\r
 141 --=-=-=--\r