1 Return-Path: <pieter@praet.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 46FD6431FAF
\r
6 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 12:50:32 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at olra.theworths.org
\r
11 X-Spam-Status: No, score=-0.7 tagged_above=-999 required=5
\r
12 tests=[RCVD_IN_DNSWL_LOW=-0.7] autolearn=disabled
\r
13 Received: from olra.theworths.org ([127.0.0.1])
\r
14 by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024)
\r
15 with ESMTP id KGDM4qxstO9T for <notmuch@notmuchmail.org>;
\r
16 Sun, 19 Feb 2012 12:50:30 -0800 (PST)
\r
17 Received: from mail-ww0-f45.google.com (mail-ww0-f45.google.com
\r
18 [74.125.82.45]) (using TLSv1 with cipher RC4-SHA (128/128 bits)) (No client
\r
19 certificate requested) by olra.theworths.org (Postfix) with ESMTPS id
\r
20 3F16E431FC0 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 12:50:27 -0800
\r
22 Received: by mail-ww0-f45.google.com with SMTP id dt12so4008173wgb.2
\r
23 for <notmuch@notmuchmail.org>; Sun, 19 Feb 2012 12:50:26 -0800 (PST)
\r
24 Received-SPF: pass (google.com: domain of pieter@praet.org designates
\r
25 10.180.81.66 as permitted sender) client-ip=10.180.81.66;
\r
26 Authentication-Results: mr.google.com;
\r
27 spf=pass (google.com: domain of pieter@praet.org
\r
28 designates 10.180.81.66 as permitted sender)
\r
29 smtp.mail=pieter@praet.org
\r
30 Received: from mr.google.com ([10.180.81.66])
\r
31 by 10.180.81.66 with SMTP id y2mr11810002wix.20.1329684626885 (num_hops
\r
32 = 1); Sun, 19 Feb 2012 12:50:26 -0800 (PST)
\r
34 Received: by 10.180.81.66 with SMTP id y2mr9879504wix.20.1329684626818;
\r
35 Sun, 19 Feb 2012 12:50:26 -0800 (PST)
\r
36 Received: from localhost (104.218-242-81.adsl-dyn.isp.belgacom.be.
\r
38 by mx.google.com with ESMTPS id dr5sm29363555wib.0.2012.02.19.12.50.26
\r
39 (version=TLSv1/SSLv3 cipher=OTHER);
\r
40 Sun, 19 Feb 2012 12:50:26 -0800 (PST)
\r
41 From: Pieter Praet <pieter@praet.org>
\r
42 To: David Bremner <david@tethera.net>,
\r
43 Tomi Ollila <tomi.ollila@iki.fi>
\r
44 Subject: [PATCH 4/6] cli: notmuch new: optionally output debug information
\r
45 when ignoring files/directories
\r
46 Date: Sun, 19 Feb 2012 21:47:54 +0100
\r
47 Message-Id: <1329684476-9596-5-git-send-email-pieter@praet.org>
\r
48 X-Mailer: git-send-email 1.7.8.1
\r
49 In-Reply-To: <1329684476-9596-1-git-send-email-pieter@praet.org>
\r
50 References: <8739a93beq.fsf@zancas.localnet>
\r
51 <1329684476-9596-1-git-send-email-pieter@praet.org>
\r
53 ALoCoQl0GFGvPtd35WLgBeMDxR/23Ufm8Px8WuIVs9sA8w3Xg7s59EvVrVPk4eVHVzs+YYjEoehN
\r
54 Cc: Notmuch Mail <notmuch@notmuchmail.org>
\r
55 X-BeenThere: notmuch@notmuchmail.org
\r
56 X-Mailman-Version: 2.1.13
\r
58 List-Id: "Use and development of the notmuch mail system."
\r
59 <notmuch.notmuchmail.org>
\r
60 List-Unsubscribe: <http://notmuchmail.org/mailman/options/notmuch>,
\r
61 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
62 List-Archive: <http://notmuchmail.org/pipermail/notmuch>
\r
63 List-Post: <mailto:notmuch@notmuchmail.org>
\r
64 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
65 List-Subscribe: <http://notmuchmail.org/mailman/listinfo/notmuch>,
\r
66 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
67 X-List-Received-Date: Sun, 19 Feb 2012 20:50:32 -0000
\r
69 When running 'notmuch new' with the '--debug' option, output debug
\r
70 information regarding explicitly ignored files and directories.
\r
72 notmuch-new.c | 15 ++++++++++++++-
\r
73 1 files changed, 14 insertions(+), 1 deletions(-)
\r
75 diff --git a/notmuch-new.c b/notmuch-new.c
\r
76 index ca12003..6f34da1 100644
\r
79 @@ -347,6 +347,10 @@ add_files_recursive (notmuch_database_t *notmuch,
\r
80 strcmp (entry->d_name, ".notmuch") == 0 ||
\r
81 _entry_in_ignore_list (entry->d_name, state))
\r
83 + if (_entry_in_ignore_list (entry->d_name, state) && state->debug)
\r
84 + printf ("(D) add_files_recursive, pass 1: explicitly ignoring %s/%s\n",
\r
90 @@ -387,8 +391,13 @@ add_files_recursive (notmuch_database_t *notmuch,
\r
91 entry = fs_entries[i];
\r
93 /* Ignore files & directories user has configured to be ignored */
\r
94 - if (_entry_in_ignore_list (entry->d_name, state))
\r
95 + if (_entry_in_ignore_list (entry->d_name, state)) {
\r
97 + printf ("(D) add_files_recursive, pass 2: explicitly ignoring %s/%s\n",
\r
103 /* Check if we've walked past any names in db_files or
\r
104 * db_subdirs. If so, these have been deleted. */
\r
105 @@ -701,6 +710,10 @@ count_files (const char *path, int *count, add_files_state_t *state)
\r
106 strcmp (entry->d_name, ".notmuch") == 0 ||
\r
107 _entry_in_ignore_list (entry->d_name, state))
\r
109 + if (_entry_in_ignore_list (entry->d_name, state) && state->debug)
\r
110 + printf ("(D) count_files: explicitly ignoring %s/%s\n",
\r