Re: [PATCH v2] cli/new: add more debugging output

diff --git a/fb/c8a3b8e59eefec802b7b1d4e36c04e07328f38 b/fb/c8a3b8e59eefec802b7b1d4e36c04e07328f38
new file mode 100644 (file)
index 0000000..afe5e23
--- /dev/null
+++ b/fb/c8a3b8e59eefec802b7b1d4e36c04e07328f38
@@ -0,0 +1,123 @@
+Return-Path: <tomi.ollila@iki.fi>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id EB3EF6DE17E5\r
+ for <notmuch@notmuchmail.org>; Sun,  2 Aug 2015 02:18:39 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0.921\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0.921 tagged_above=-999 required=5 tests=[AWL=0.269, \r
+ SPF_NEUTRAL=0.652] autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id BYeTw2olNBDZ for <notmuch@notmuchmail.org>;\r
+ Sun,  2 Aug 2015 02:18:37 -0700 (PDT)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 81CDF6DE17A7\r
+ for <notmuch@notmuchmail.org>; Sun,  2 Aug 2015 02:18:37 -0700 (PDT)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+ by guru.guru-group.fi (Postfix) with ESMTP id 91F31100046;\r
+ Sun,  2 Aug 2015 12:18:22 +0300 (EEST)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: David Bremner <david@tethera.net>\r
+Subject: Re: [PATCH v2] cli/new: add more debugging output\r
+In-Reply-To: <1438506278-18880-1-git-send-email-david@tethera.net>\r
+References: <87k2wybgjk.fsf@maritornes.cs.unb.ca>\r
+ <1438506278-18880-1-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.20.2+31~g967a7a3 (http://notmuchmail.org) Emacs/24.3.1\r
+ (x86_64-unknown-linux-gnu)\r
+X-Face: HhBM'cA~<r"^Xv\KRN0P{vn'Y"Kd;zg_y3S[4)KSN~s?O\"QPoL\r
+ $[Xv_BD:i/F$WiEWax}R(MPS`^UaptOGD`*/=@\1lKoVa9tnrg0TW?"r7aRtgk[F\r
+ !)g;OY^,BjTbr)Np:%c_o'jj,Z\r
+Date: Sun, 02 Aug 2015 12:18:22 +0300\r
+Message-ID: <m2a8ua2gm9.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: notmuch@notmuchmail.org\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.18\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, 02 Aug 2015 09:18:40 -0000\r
+\r
+On Sun, Aug 02 2015, David Bremner <david@tethera.net> wrote:\r
+\r
+> Try to narrow down what part of the code adds files and directories to\r
+> the queue(s) to be deleted.\r
+> ---\r
+\r
+Looks trivial enough to me. +1\r
+\r
+Tomi\r
+\r
+\r
+>\r
+>  - print slightly less scary messages\r
+>  - use git-send-email to send\r
+>\r
+>  notmuch-new.c | 14 ++++++++++++++\r
+>  1 file changed, 14 insertions(+)\r
+>\r
+> diff --git a/notmuch-new.c b/notmuch-new.c\r
+> index 8ff1ade..ee786a3 100644\r
+> --- a/notmuch-new.c\r
+> +++ b/notmuch-new.c\r
+> @@ -528,6 +528,10 @@ add_files (notmuch_database_t *notmuch,\r
+>                                            "%s/%s", path,\r
+>                                            notmuch_filenames_get (db_files));\r
+>  \r
+> +        if (state->debug)\r
+> +            printf ("(D) add_files_recursive, pass 2: queuing passed file %s for deletion from database\n",\r
+> +                    absolute);\r
+> +\r
+>          _filename_list_add (state->removed_files, absolute);\r
+>  \r
+>          notmuch_filenames_move_to_next (db_files);\r
+> @@ -542,6 +546,9 @@ add_files (notmuch_database_t *notmuch,\r
+>          {\r
+>              char *absolute = talloc_asprintf (state->removed_directories,\r
+>                                                "%s/%s", path, filename);\r
+> +            if (state->debug)\r
+> +                printf ("(D) add_files_recursive, pass 2: queuing passed directory %s for deletion from database\n",\r
+> +                    absolute);\r
+>  \r
+>              _filename_list_add (state->removed_directories, absolute);\r
+>          }\r
+> @@ -610,6 +617,9 @@ add_files (notmuch_database_t *notmuch,\r
+>      char *absolute = talloc_asprintf (state->removed_files,\r
+>                                        "%s/%s", path,\r
+>                                        notmuch_filenames_get (db_files));\r
+> +    if (state->debug)\r
+> +        printf ("(D) add_files_recursive, pass 3: queuing leftover file %s for deletion from database\n",\r
+> +                absolute);\r
+>  \r
+>      _filename_list_add (state->removed_files, absolute);\r
+>  \r
+> @@ -622,6 +632,10 @@ add_files (notmuch_database_t *notmuch,\r
+>                                        "%s/%s", path,\r
+>                                        notmuch_filenames_get (db_subdirs));\r
+>  \r
+> +    if (state->debug)\r
+> +        printf ("(D) add_files_recursive, pass 3: queuing leftover directory %s for deletion from database\n",\r
+> +                absolute);\r
+> +\r
+>      _filename_list_add (state->removed_directories, absolute);\r
+>  \r
+>      notmuch_filenames_move_to_next (db_subdirs);\r
+> -- \r
+> 2.1.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r