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 arlo.cworth.org (Postfix) with ESMTP id F104C6DE1926
\r
6 for <notmuch@notmuchmail.org>; Tue, 3 Nov 2015 11:50:17 -0800 (PST)
\r
7 X-Virus-Scanned: Debian amavisd-new at cworth.org
\r
8 X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References"
\r
10 X-Spam-Score: -0.191
\r
12 X-Spam-Status: No, score=-0.191 tagged_above=-999 required=5
\r
13 tests=[AWL=-0.171, DKIM_SIGNED=0.1, DKIM_VALID=-0.1,
\r
14 RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01] autolearn=disabled
\r
15 Received: from arlo.cworth.org ([127.0.0.1])
\r
16 by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)
\r
17 with ESMTP id kdozXDrG-alt for <notmuch@notmuchmail.org>;
\r
18 Tue, 3 Nov 2015 11:50:14 -0800 (PST)
\r
19 Received: from mail-wm0-f49.google.com (mail-wm0-f49.google.com
\r
20 [74.125.82.49]) by arlo.cworth.org (Postfix) with ESMTPS id 93DC56DE0281 for
\r
21 <notmuch@notmuchmail.org>; Tue, 3 Nov 2015 11:50:13 -0800 (PST)
\r
22 Received: by wmll128 with SMTP id l128so96605380wml.0
\r
23 for <notmuch@notmuchmail.org>; Tue, 03 Nov 2015 11:50:11 -0800 (PST)
\r
24 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
25 d=nikula_org.20150623.gappssmtp.com; s=20150623;
\r
26 h=from:to:cc:subject:date:message-id:in-reply-to:references
\r
27 :in-reply-to:references;
\r
28 bh=+Ura8p8X5sRQN0tfESvEafAAba/BGrNRDaqUUlt1uoI=;
\r
29 b=chQxy9e7BkgQWJe0aM3Q1YUi6X5A0w+le3VIqcwwAhRSTVKGZpo1r7JuPDMI4afcmL
\r
30 fMOwKHb9sFg6qIAffcoJvpJkIbHLHElqETgpm9OBId4OPFutsLaqQpfhE3JhAElYB4Wh
\r
31 GlYs32215SJ4bODqilNQkczTHzs89irjCzMKfxzFeAVyTDQP7FJJbqSC4zxqT35pGD3t
\r
32 Rx3IOBVeDjm5wF2y6UJrz4bfsZnmMSuknb5oTUw81JBO1n6iD/CuJhqig7Nny0aOJcOj
\r
33 Ee3fxB1wubwDSUJjScsF77Jm5g16kspcU9KGIvm2bspibtGcEOFulsVJjJkPl2FMzkcu
\r
35 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
\r
36 d=1e100.net; s=20130820;
\r
37 h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
\r
38 :references:in-reply-to:references;
\r
39 bh=+Ura8p8X5sRQN0tfESvEafAAba/BGrNRDaqUUlt1uoI=;
\r
40 b=aCNW1U4gf1bJBwSlMBhfRL2ID9zLGWjKrXF3j2mKqjUTgg3urj69ThFLbpB5JvFMWC
\r
41 L5h7nGtPBmTcSf8kwUiIQRw1D9ZJUK8lrbDJUJXkw90oETwVYM3qvD0bjLfPDudHDTs9
\r
42 EfrV9CNm9hCmAP0gYjkvnVqVy6KLk0PPOJlevbz4QYvYxhV9Btfw4+r57Yw8m2qtGDsd
\r
43 bvovhlY9naGvpx5aSAMo6qqP1ZisIT/vMw/WxaetkulPAUEQnWD1flvd2pWrWtw9JA9A
\r
44 nycClxqe5TFwIokDlveViLOVbmiN99EB+FjBmSXnj+TiPbh76yNvA90SkNDxWCgDhezf
\r
47 ALoCoQn3l2n5d5rLGN8UuM2x6Z67Mm5FkmyoJuihuf4ewKZQrM2qh44FBxZozoyVt5qoVciMPvOu
\r
48 X-Received: by 10.28.137.211 with SMTP id l202mr22157798wmd.90.1446580211612;
\r
49 Tue, 03 Nov 2015 11:50:11 -0800 (PST)
\r
50 Received: from localhost (mobile-access-bceec0-208.dhcp.inet.fi.
\r
52 by smtp.gmail.com with ESMTPSA id q204sm24942935wmg.4.2015.11.03.11.50.10
\r
53 (version=TLSv1/SSLv3 cipher=OTHER);
\r
54 Tue, 03 Nov 2015 11:50:11 -0800 (PST)
\r
55 From: Jani Nikula <jani@nikula.org>
\r
56 To: notmuch@notmuchmail.org
\r
57 Subject: [RFC 1/5] cli: fix function name in notmuch new debug logging
\r
58 Date: Tue, 3 Nov 2015 21:49:29 +0200
\r
60 <2c0b2439c1d7c799542aa5290c2e4342d6efccf4.1446579858.git.jani@nikula.org>
\r
61 X-Mailer: git-send-email 2.1.4
\r
62 In-Reply-To: <cover.1446579858.git.jani@nikula.org>
\r
63 References: <cover.1446579858.git.jani@nikula.org>
\r
64 In-Reply-To: <cover.1446579858.git.jani@nikula.org>
\r
65 References: <cover.1446579858.git.jani@nikula.org>
\r
66 X-BeenThere: notmuch@notmuchmail.org
\r
67 X-Mailman-Version: 2.1.20
\r
69 List-Id: "Use and development of the notmuch mail system."
\r
70 <notmuch.notmuchmail.org>
\r
71 List-Unsubscribe: <https://notmuchmail.org/mailman/options/notmuch>,
\r
72 <mailto:notmuch-request@notmuchmail.org?subject=unsubscribe>
\r
73 List-Archive: <http://notmuchmail.org/pipermail/notmuch/>
\r
74 List-Post: <mailto:notmuch@notmuchmail.org>
\r
75 List-Help: <mailto:notmuch-request@notmuchmail.org?subject=help>
\r
76 List-Subscribe: <https://notmuchmail.org/mailman/listinfo/notmuch>,
\r
77 <mailto:notmuch-request@notmuchmail.org?subject=subscribe>
\r
78 X-List-Received-Date: Tue, 03 Nov 2015 19:50:18 -0000
\r
80 add_files_recursive has been renamed add_files long ago.
\r
82 notmuch-new.c | 15 +++++++--------
\r
83 test/T050-new.sh | 40 ++++++++++++++++++++--------------------
\r
84 2 files changed, 27 insertions(+), 28 deletions(-)
\r
86 diff --git a/notmuch-new.c b/notmuch-new.c
\r
87 index d45d0af8642a..e5037761c8ee 100644
\r
90 @@ -445,7 +445,7 @@ add_files (notmuch_database_t *notmuch,
\r
92 if (_entry_in_ignore_list (entry->d_name, state)) {
\r
94 - printf ("(D) add_files_recursive, pass 1: explicitly ignoring %s/%s\n",
\r
95 + printf ("(D) add_files, pass 1: explicitly ignoring %s/%s\n",
\r
96 path, entry->d_name);
\r
99 @@ -513,9 +513,8 @@ add_files (notmuch_database_t *notmuch,
\r
100 /* Ignore files & directories user has configured to be ignored */
\r
101 if (_entry_in_ignore_list (entry->d_name, state)) {
\r
103 - printf ("(D) add_files_recursive, pass 2: explicitly ignoring %s/%s\n",
\r
106 + printf ("(D) add_files, pass 2: explicitly ignoring %s/%s\n",
\r
107 + path, entry->d_name);
\r
111 @@ -529,7 +528,7 @@ add_files (notmuch_database_t *notmuch,
\r
112 notmuch_filenames_get (db_files));
\r
115 - printf ("(D) add_files_recursive, pass 2: queuing passed file %s for deletion from database\n",
\r
116 + printf ("(D) add_files, pass 2: queuing passed file %s for deletion from database\n",
\r
119 _filename_list_add (state->removed_files, absolute);
\r
120 @@ -547,7 +546,7 @@ add_files (notmuch_database_t *notmuch,
\r
121 char *absolute = talloc_asprintf (state->removed_directories,
\r
122 "%s/%s", path, filename);
\r
124 - printf ("(D) add_files_recursive, pass 2: queuing passed directory %s for deletion from database\n",
\r
125 + printf ("(D) add_files, pass 2: queuing passed directory %s for deletion from database\n",
\r
128 _filename_list_add (state->removed_directories, absolute);
\r
129 @@ -618,7 +617,7 @@ add_files (notmuch_database_t *notmuch,
\r
131 notmuch_filenames_get (db_files));
\r
133 - printf ("(D) add_files_recursive, pass 3: queuing leftover file %s for deletion from database\n",
\r
134 + printf ("(D) add_files, pass 3: queuing leftover file %s for deletion from database\n",
\r
137 _filename_list_add (state->removed_files, absolute);
\r
138 @@ -633,7 +632,7 @@ add_files (notmuch_database_t *notmuch,
\r
139 notmuch_filenames_get (db_subdirs));
\r
142 - printf ("(D) add_files_recursive, pass 3: queuing leftover directory %s for deletion from database\n",
\r
143 + printf ("(D) add_files, pass 3: queuing leftover directory %s for deletion from database\n",
\r
146 _filename_list_add (state->removed_directories, absolute);
\r
147 diff --git a/test/T050-new.sh b/test/T050-new.sh
\r
148 index 81cf2fad10ad..93a6fa94ae7c 100755
\r
149 --- a/test/T050-new.sh
\r
150 +++ b/test/T050-new.sh
\r
151 @@ -64,7 +64,7 @@ generate_message
\r
152 notmuch new > /dev/null
\r
153 mv "$gen_msg_filename" "${gen_msg_filename}"-renamed
\r
154 output=$(NOTMUCH_NEW --debug)
\r
155 -test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed file ${gen_msg_filename} for deletion from database
\r
156 +test_expect_equal "$output" "(D) add_files, pass 2: queuing passed file ${gen_msg_filename} for deletion from database
\r
157 No new mail. Detected 1 file rename."
\r
160 @@ -72,7 +72,7 @@ test_begin_subtest "Deleted message"
\r
162 rm "${gen_msg_filename}"-renamed
\r
163 output=$(NOTMUCH_NEW --debug)
\r
164 -test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database
\r
165 +test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover file ${gen_msg_filename}-renamed for deletion from database
\r
166 No new mail. Removed 1 message."
\r
169 @@ -88,7 +88,7 @@ notmuch new > /dev/null
\r
170 mv "${MAIL_DIR}"/dir "${MAIL_DIR}"/dir-renamed
\r
172 output=$(NOTMUCH_NEW --debug)
\r
173 -test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir for deletion from database
\r
174 +test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory ${MAIL_DIR}/dir for deletion from database
\r
175 No new mail. Detected 3 file renames."
\r
178 @@ -96,7 +96,7 @@ test_begin_subtest "Deleted directory"
\r
179 rm -rf "${MAIL_DIR}"/dir-renamed
\r
181 output=$(NOTMUCH_NEW --debug)
\r
182 -test_expect_equal "$output" "(D) add_files_recursive, pass 2: queuing passed directory ${MAIL_DIR}/dir-renamed for deletion from database
\r
183 +test_expect_equal "$output" "(D) add_files, pass 2: queuing passed directory ${MAIL_DIR}/dir-renamed for deletion from database
\r
184 No new mail. Removed 3 messages."
\r
187 @@ -115,7 +115,7 @@ test_begin_subtest "Deleted directory (end of list)"
\r
188 rm -rf "${MAIL_DIR}"/zzz
\r
190 output=$(NOTMUCH_NEW --debug)
\r
191 -test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/zzz for deletion from database
\r
192 +test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory ${MAIL_DIR}/zzz for deletion from database
\r
193 No new mail. Removed 3 messages."
\r
196 @@ -166,7 +166,7 @@ test_begin_subtest "Deleted two-level directory"
\r
197 rm -rf "${MAIL_DIR}"/two
\r
199 output=$(NOTMUCH_NEW --debug)
\r
200 -test_expect_equal "$output" "(D) add_files_recursive, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database
\r
201 +test_expect_equal "$output" "(D) add_files, pass 3: queuing leftover directory ${MAIL_DIR}/two for deletion from database
\r
202 No new mail. Removed 3 messages."
\r
204 test_begin_subtest "Support single-message mbox"
\r
205 @@ -227,20 +227,20 @@ mkdir -p "${MAIL_DIR}"/one/two/three/.git
\r
206 touch "${MAIL_DIR}"/{one,one/two,one/two/three}/ignored_file
\r
207 output=$(NOTMUCH_NEW --debug 2>&1 | sort)
\r
208 test_expect_equal "$output" \
\r
209 -"(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.git
\r
210 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
\r
211 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file
\r
212 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/ignored_file
\r
213 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file
\r
214 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/.git
\r
215 -(D) add_files_recursive, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file
\r
216 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/.git
\r
217 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
\r
218 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file
\r
219 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/ignored_file
\r
220 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file
\r
221 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/.git
\r
222 -(D) add_files_recursive, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file
\r
223 +"(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.git
\r
224 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
\r
225 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/ignored_file
\r
226 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/ignored_file
\r
227 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file
\r
228 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/.git
\r
229 +(D) add_files, pass 1: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file
\r
230 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.git
\r
231 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/.ignored_hidden_file
\r
232 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/ignored_file
\r
233 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/ignored_file
\r
234 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/ignored_file
\r
235 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/.git
\r
236 +(D) add_files, pass 2: explicitly ignoring ${MAIL_DIR}/one/two/three/ignored_file
\r