--- /dev/null
+Return-Path: <jani@nikula.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 178E6431FD0\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Jun 2013 08:57:19 -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 sQvTKbbIixMZ for <notmuch@notmuchmail.org>;\r
+ Mon, 10 Jun 2013 08:57:11 -0700 (PDT)\r
+Received: from mail-la0-f49.google.com (mail-la0-f49.google.com\r
+ [209.85.215.49]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+ (No client certificate requested)\r
+ by olra.theworths.org (Postfix) with ESMTPS id D60D8431FAE\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Jun 2013 08:57:10 -0700 (PDT)\r
+Received: by mail-la0-f49.google.com with SMTP id ea20so2309231lab.8\r
+ for <notmuch@notmuchmail.org>; Mon, 10 Jun 2013 08:57:09 -0700 (PDT)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+ d=google.com; s=20120113;\r
+ h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references\r
+ :x-gm-message-state;\r
+ bh=r283qVMMoWo046dZx7UjA22Xxwuxf6aVkLrhevbmCS4=;\r
+ b=NtgsGVuiPdPbA2bmQjf912TC1aXoRBkdCDIW4F1iUvU2XgQHT7/eo7M520ImzJP8j3\r
+ 0IDpq0bw75GmVCT6X8D/HK72UTS39sDM2jp7JOGl/WRPuCwWyHY14EkL/kQ5EPnrB6xh\r
+ dFyQZtuP7b2hBjoZfbe/MDAftpVTF5Gue4GwUCRX1/Xw5s6CH21CZCSdAhFiCb4fiwoM\r
+ DSwoIuMqmPmtjr3kyJznWDdIWeoZ0SdDT70L22p7fO5wmsgzfmtCnBORqF7x7YpGZnme\r
+ 6h4ly2zMPpmt0m9DniVP338PJqFDd8KsPYHTm6K0L7FGIHvIZGrIw1iQr5sIEC2vmwa4\r
+ OZZQ==\r
+X-Received: by 10.152.28.129 with SMTP id b1mr2614338lah.51.1370879829364;\r
+ Mon, 10 Jun 2013 08:57:09 -0700 (PDT)\r
+Received: from localhost (dsl-hkibrasgw2-58c376-211.dhcp.inet.fi.\r
+ [88.195.118.211])\r
+ by mx.google.com with ESMTPSA id p16sm5897172lbi.13.2013.06.10.08.57.07\r
+ for <multiple recipients>\r
+ (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+ Mon, 10 Jun 2013 08:57:08 -0700 (PDT)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH v3] cli: add --duplicate=N option to notmuch search\r
+Date: Mon, 10 Jun 2013 18:57:03 +0300\r
+Message-Id: <1370879823-1388-1-git-send-email-jani@nikula.org>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To:\r
+ <61ed86f221d65b4dba438cbc2b4c5b77a484a534.1370775663.git.jani@nikula.org>\r
+References:\r
+ <61ed86f221d65b4dba438cbc2b4c5b77a484a534.1370775663.git.jani@nikula.org>\r
+X-Gm-Message-State:\r
+ ALoCoQlR8VjniLD8k1L5152Uk3Y8G903sHP4rd6edZ8iidQGq3Gj8pN28sNTxcqT2dYwbys/7eyc\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: Mon, 10 Jun 2013 15:57:19 -0000\r
+\r
+Effective with --output=files, output the Nth filename associated with\r
+each message matching the query (N is 1-based). If N is greater than\r
+the number of files associated with the message, don't print anything.\r
+\r
+---\r
+\r
+v3: fix commit message, no other changes\r
+---\r
+ notmuch-search.c | 18 ++++++++++++------\r
+ 1 file changed, 12 insertions(+), 6 deletions(-)\r
+\r
+diff --git a/notmuch-search.c b/notmuch-search.c\r
+index 4323201..196934b 100644\r
+--- a/notmuch-search.c\r
++++ b/notmuch-search.c\r
+@@ -177,7 +177,8 @@ do_search_messages (sprinter_t *format,\r
+ notmuch_query_t *query,\r
+ output_t output,\r
+ int offset,\r
+- int limit)\r
++ int limit,\r
++ int dupe)\r
+ {\r
+ notmuch_message_t *message;\r
+ notmuch_messages_t *messages;\r
+@@ -206,14 +207,17 @@ do_search_messages (sprinter_t *format,\r
+ message = notmuch_messages_get (messages);\r
+ \r
+ if (output == OUTPUT_FILES) {\r
++ int j;\r
+ filenames = notmuch_message_get_filenames (message);\r
+ \r
+- for (;\r
++ for (j = 1;\r
+ notmuch_filenames_valid (filenames);\r
+- notmuch_filenames_move_to_next (filenames))\r
++ notmuch_filenames_move_to_next (filenames), j++)\r
+ {\r
+- format->string (format, notmuch_filenames_get (filenames));\r
+- format->separator (format);\r
++ if (dupe < 0 || dupe == j) {\r
++ format->string (format, notmuch_filenames_get (filenames));\r
++ format->separator (format);\r
++ }\r
+ }\r
+ \r
+ notmuch_filenames_destroy( filenames );\r
+@@ -303,6 +307,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ int offset = 0;\r
+ int limit = -1; /* unlimited */\r
+ int exclude = EXCLUDE_TRUE;\r
++ int dupe = -1;\r
+ unsigned int i;\r
+ \r
+ enum {\r
+@@ -339,6 +344,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ { 0, 0 } } },\r
+ { NOTMUCH_OPT_INT, &offset, "offset", 'O', 0 },\r
+ { NOTMUCH_OPT_INT, &limit, "limit", 'L', 0 },\r
++ { NOTMUCH_OPT_INT, &dupe, "duplicate", 'D', 0 },\r
+ { 0, 0, 0, 0, 0 }\r
+ };\r
+ \r
+@@ -424,7 +430,7 @@ notmuch_search_command (notmuch_config_t *config, int argc, char *argv[])\r
+ break;\r
+ case OUTPUT_MESSAGES:\r
+ case OUTPUT_FILES:\r
+- ret = do_search_messages (format, query, output, offset, limit);\r
++ ret = do_search_messages (format, query, output, offset, limit, dupe);\r
+ break;\r
+ case OUTPUT_TAGS:\r
+ ret = do_search_tags (notmuch, format, query);\r
+-- \r
+1.7.10.4\r
+\r
projects / notmuch-archives.git / commitdiff