[PATCH 2/7] cli: only check the ignore list if needed

diff --git a/bd/5c713697dd51049a063855464fb5aed8ec664c b/bd/5c713697dd51049a063855464fb5aed8ec664c
new file mode 100644 (file)
index 0000000..04db342
--- /dev/null
+++ b/bd/5c713697dd51049a063855464fb5aed8ec664c
@@ -0,0 +1,92 @@
+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 9F045431FC4\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Jan 2014 12:32:52 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"\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 c1dXMymk8KdL for <notmuch@notmuchmail.org>;\r
+       Sun, 19 Jan 2014 12:32:47 -0800 (PST)\r
+Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com\r
+       [209.85.215.174]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 7EAC6431FC2\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Jan 2014 12:32:44 -0800 (PST)\r
+Received: by mail-ea0-f174.google.com with SMTP id b10so2716890eae.33\r
+       for <notmuch@notmuchmail.org>; Sun, 19 Jan 2014 12:32:42 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=1e100.net; s=20130820;\r
+       h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to\r
+       :references:in-reply-to:references;\r
+       bh=JdCwtWb9BtRHR0JMifCjyJMlDcP0IRZm4q8ezUjIeic=;\r
+       b=bWAOQQF7FbQkh/oFq5P2sRXMWHL/mc+bAW/BaZbY9H73xKyWgN2H9XnUSc2I+gMIpL\r
+       ygfAE4jGR2LgmzSuW0RyQXGN/unlsBsu7CSUjmzhLwKf3YySTLUTF7HxKgypLW9tG33q\r
+       acgJyZZFjpew7Lpl8c4n+QbVUKHGIykTlxmEqP3eMqBp4WT1W+wN9Ns3fGaFg5FI7YJ8\r
+       W37zspM8hpZEhex0xDBkydI986UnbvjevSbkplgzUHBA4/OyA7qCSCVT6FuhutLm13Cp\r
+       YXQBKTHLIo2+0JnXiS3Oc4lwOrLwqvKTyp0j5St8lO3XKua40bjK/mHsZvhxzNkPTXOn\r
+       Tf2Q==\r
+X-Gm-Message-State:\r
+ ALoCoQlsQoYa/CEus3T8vq+c07c7zvpS9M9khArrAf8leNktwyj+kmlhwrBtARWPlRNED8iB5vw6\r
+X-Received: by 10.15.109.196 with SMTP id cf44mr14038166eeb.12.1390163562043; \r
+       Sun, 19 Jan 2014 12:32:42 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw2-58c36f-91.dhcp.inet.fi.\r
+       [88.195.111.91])\r
+       by mx.google.com with ESMTPSA id x2sm43846026eeo.8.2014.01.19.12.32.40\r
+       for <multiple recipients>\r
+       (version=TLSv1.2 cipher=RC4-SHA bits=128/128);\r
+       Sun, 19 Jan 2014 12:32:41 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: notmuch@notmuchmail.org\r
+Subject: [PATCH 2/7] cli: only check the ignore list if needed\r
+Date: Sun, 19 Jan 2014 22:32:23 +0200\r
+Message-Id:\r
+ <6fedb8aeeffb6c78aeb4a837267ad3c0d2dddee9.1390163335.git.jani@nikula.org>\r
+X-Mailer: git-send-email 1.8.5.2\r
+In-Reply-To: <cover.1390163335.git.jani@nikula.org>\r
+References: <cover.1390163335.git.jani@nikula.org>\r
+In-Reply-To: <cover.1390163335.git.jani@nikula.org>\r
+References: <cover.1390163335.git.jani@nikula.org>\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, 19 Jan 2014 20:32:52 -0000\r
+\r
+Premature optimization is the root of all evil, but this is simple\r
+enough.\r
+---\r
+ notmuch-new.c | 2 +-\r
+ 1 file changed, 1 insertion(+), 1 deletion(-)\r
+\r
+diff --git a/notmuch-new.c b/notmuch-new.c\r
+index 1dd8fc9..7f3b3b0 100644\r
+--- a/notmuch-new.c\r
++++ b/notmuch-new.c\r
+@@ -728,7 +728,7 @@ count_files (const char *path, int *count, add_files_state_t *state)\r
+           strcmp (entry->d_name, ".notmuch") == 0 ||\r
+           _entry_in_ignore_list (entry->d_name, state))\r
+       {\r
+-          if (_entry_in_ignore_list (entry->d_name, state) && state->debug)\r
++          if (state->debug && _entry_in_ignore_list (entry->d_name, state))\r
+               printf ("(D) count_files: explicitly ignoring %s/%s\n",\r
+                       path,\r
+                       entry->d_name);\r
+-- \r
+1.8.5.2\r
+\r