1 Return-Path: <jani@nikula.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 88A6A431FCB
\r
6 for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:03:33 -0700 (PDT)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
12 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
13 tests=[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 LxUovO-PcEW8 for <notmuch@notmuchmail.org>;
\r
17 Sun, 9 Jun 2013 04:03:26 -0700 (PDT)
\r
18 Received: from mail-lb0-f179.google.com (mail-lb0-f179.google.com
\r
19 [209.85.217.179]) (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 B9282431FB6
\r
22 for <notmuch@notmuchmail.org>; Sun, 9 Jun 2013 04:03:25 -0700 (PDT)
\r
23 Received: by mail-lb0-f179.google.com with SMTP id w20so5376991lbh.24
\r
24 for <notmuch@notmuchmail.org>; Sun, 09 Jun 2013 04:03:23 -0700 (PDT)
\r
25 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
26 d=google.com; s=20120113;
\r
27 h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references
\r
28 :in-reply-to:references:x-gm-message-state;
\r
29 bh=i74P4zrjcaZ+45eCzg0H+uO9iuXELkN4SoBEus58xVQ=;
\r
30 b=SNh+E/CFk1BTIzxvU3c7hwmcm5Ziu5nSeBNZbesIu/VeZH5lYupX2fczroO2QCW/Pu
\r
31 ZOcERKy7jcASPRHVsThbSCi66jASvZFnZ4mXZK9SybFkco54bXcMk3LdAj056M0efdFe
\r
32 s7bPIcZRyS7jyKywVzun8fW0WKP8Un8uHQ9wp/cYn+Pn9mHNAZZ0FzMSdzCEzwHIfGqO
\r
33 fBM02VhJ+g8Nmh80IW5jDEM9XOREPIB3R46fg4D12hCueJxn5MfzA2IhFsm0yFlmoChj
\r
34 47G0wdTIIFH9DJu4adkmKuJq+HNzEQs3/upc+wN43y0gEo3/U3etXTIegFMvOxagGlsX
\r
36 X-Received: by 10.112.211.167 with SMTP id nd7mr4478522lbc.59.1370775802949;
\r
37 Sun, 09 Jun 2013 04:03:22 -0700 (PDT)
\r
38 Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.
\r
40 by mx.google.com with ESMTPSA id x3sm2533055lag.6.2013.06.09.04.03.20
\r
41 for <multiple recipients>
\r
42 (version=TLSv1.2 cipher=RC4-SHA bits=128/128);
\r
43 Sun, 09 Jun 2013 04:03:22 -0700 (PDT)
\r
44 From: Jani Nikula <jani@nikula.org>
\r
45 To: notmuch@notmuchmail.org
\r
46 Subject: [PATCH v2 1/7] cli: add --duplicate=N option to notmuch search
\r
47 Date: Sun, 9 Jun 2013 14:03:07 +0300
\r
49 <61ed86f221d65b4dba438cbc2b4c5b77a484a534.1370775663.git.jani@nikula.org>
\r
50 X-Mailer: git-send-email 1.7.10.4
\r
51 In-Reply-To: <cover.1370775663.git.jani@nikula.org>
\r
52 References: <cover.1370775663.git.jani@nikula.org>
\r
53 In-Reply-To: <cover.1370775663.git.jani@nikula.org>
\r
54 References: <cover.1370775663.git.jani@nikula.org>
\r
56 ALoCoQmjZoTW4LfDqOTSAUZMcG2QAvBvt3tL5/AEIzw4DcrO3W4lRwlLLA742ht5GMupzmahxQGN
\r
57 X-BeenThere: notmuch@notmuchmail.org
\r
58 X-Mailman-Version: 2.1.13
\r
60 List-Id: "Use and development of the notmuch mail system."
\r
61 <notmuch.notmuchmail.org>
\r
62 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
63 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
64 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
65 List-Post: <mailto:notmuch@notmuchmail.org>
\r
66 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
67 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
68 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
69 X-List-Received-Date: Sun, 09 Jun 2013 11:03:33 -0000
\r
71 Effective with --output=files, output the Nth filename associated with
\r
72 each message matching the query (N is 0-based). If N is equal to or
\r
73 greater than the number of files associated with the message, don't
\r
76 notmuch-search.c | 18 ++++++++++++------
\r
77 1 file changed, 12 insertions(+), 6 deletions(-)
\r
79 diff --git a/notmuch-search.c b/notmuch-search.c
\r
80 index 4323201..196934b 100644
\r
81 --- a/notmuch-search.c
\r
82 +++ b/notmuch-search.c
\r
83 @@ -177,7 +177,8 @@ do_search_messages (sprinter_t *format,
\r
84 notmuch_query_t *query,
\r
91 notmuch_message_t *message;
\r
92 notmuch_messages_t *messages;
\r
93 @@ -206,14 +207,17 @@ do_search_messages (sprinter_t *format,
\r
94 message = notmuch_messages_get (messages);
\r
96 if (output == OUTPUT_FILES) {
\r
98 filenames = notmuch_message_get_filenames (message);
\r
102 notmuch_filenames_valid (filenames);
\r
103 - notmuch_filenames_move_to_next (filenames))
\r
104 + notmuch_filenames_move_to_next (filenames), j++)
\r
106 - format->string (format, notmuch_filenames_get (filenames));
\r
107 - format->separator (format);
\r
108 + if (dupe < 0 || dupe == j) {
\r
109 + format->string (format, notmuch_filenames_get (filenames));
\r
110 + format->separator (format);
\r
114 notmuch_filenames_destroy( filenames );
\r
115 @@ -303,6 +307,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
\r
117 int limit = -1; /* unlimited */
\r
118 int exclude = EXCLUDE_TRUE;
\r
123 @@ -339,6 +344,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
\r
125 { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },
\r
126 { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },
\r
127 + { NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 },
\r
131 @@ -424,7 +430,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])
\r
133 case OUTPUT_MESSAGES:
\r
135 - ret = do_search_messages (format, query, output, offset, limit);
\r
136 + ret = do_search_messages (format, query, output, offset, limit, dupe);
\r
139 ret = do_search_tags (notmuch, format, query);
\r