Re: v5 of Batch-tag dump/restore patches
authorJani Nikula <jani@nikula.org>
Sun, 9 Dec 2012 13:46:31 +0000 (15:46 +0200)
committerW. Trevor King <wking@tremily.us>
Fri, 7 Nov 2014 17:51:53 +0000 (09:51 -0800)
db/eaec508a8c3b45af17a7ae7d6039af8890b512 [new file with mode: 0644]

diff --git a/db/eaec508a8c3b45af17a7ae7d6039af8890b512 b/db/eaec508a8c3b45af17a7ae7d6039af8890b512
new file mode 100644 (file)
index 0000000..8a5a34b
--- /dev/null
@@ -0,0 +1,144 @@
+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 30D60431FAF\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 05:46:40 -0800 (PST)\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 Nizs77uSK8jy for <notmuch@notmuchmail.org>;\r
+       Sun,  9 Dec 2012 05:46:36 -0800 (PST)\r
+Received: from mail-lb0-f181.google.com (mail-lb0-f181.google.com\r
+       [209.85.217.181]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 1D127431FAE\r
+       for <notmuch@notmuchmail.org>; Sun,  9 Dec 2012 05:46:35 -0800 (PST)\r
+Received: by mail-lb0-f181.google.com with SMTP id ge1so1527379lbb.26\r
+       for <notmuch@notmuchmail.org>; Sun, 09 Dec 2012 05:46:34 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=from:to:subject:in-reply-to:references:user-agent:date:message-id\r
+       :mime-version:content-type:x-gm-message-state;\r
+       bh=QjntaOw+oi5z8X2leR27WWjUEmbFeWcxcgwcn4xhD9k=;\r
+       b=QvHcmHuny//m0Ln/AFqGm2zmkVaazzB9f9/c5YJUXylpONfiYbAUSzFXvwxoiWD2kp\r
+       QMEz1xZ+PXBVD55YNxPzbQs/4FT5oBEbNVVLujC+G9yrbw8efpUkAJaE+fDaXZqzHg5s\r
+       +8Q7hdcBw8GWfbMHraMIBk8xIcG3DhP6Bm2XgWpXD+ygLMVKIS0wLvAo0OUJaGMXoCCz\r
+       f3Cokfvn12UhIR0ox7dFbXH0Z8NAO5UH39MHJ+1yhIiIUScMFZ9Aj27M3UQS3VO0eudQ\r
+       dhMqnfN9ZSKiwGDI4owhe4HXIcZ740jl+9oPitIcrPdA8CM5BSHOGJjq92Lb6VRvGz6j\r
+       gMkg==\r
+Received: by 10.152.45.229 with SMTP id q5mr10771462lam.34.1355060794302;\r
+       Sun, 09 Dec 2012 05:46:34 -0800 (PST)\r
+Received: from localhost (dsl-hkibrasgw4-fe51df00-27.dhcp.inet.fi.\r
+       [80.223.81.27])\r
+       by mx.google.com with ESMTPS id ps11sm6597781lab.12.2012.12.09.05.46.32\r
+       (version=SSLv3 cipher=OTHER); Sun, 09 Dec 2012 05:46:33 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: Re: v5 of Batch-tag dump/restore patches\r
+In-Reply-To: <877gorqtai.fsf@zancas.localnet>\r
+References: <1355007421-3069-1-git-send-email-david@tethera.net>\r
+       <877gorqtai.fsf@zancas.localnet>\r
+User-Agent: Notmuch/0.14+138~g7041c56 (http://notmuchmail.org) Emacs/23.4.1\r
+       (i686-pc-linux-gnu)\r
+Date: Sun, 09 Dec 2012 15:46:31 +0200\r
+Message-ID: <87y5h7s5hk.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQk4KgMt20/xYLqdDBAB/bnPGeu6UX/aSVBAsKy3ZY4cEhMHrpqfx6zrjbD/iP2OHu1kWOfb\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, 09 Dec 2012 13:46:40 -0000\r
+\r
+On Sun, 09 Dec 2012, David Bremner <david@tethera.net> wrote:\r
+> david@tethera.net writes:\r
+>\r
+>> Yet another version. Luckily we all use threaded mailreaders, right?\r
+>>\r
+>\r
+> A few fixups Jani mentioned in IRC:\r
+\r
+The series with fixups LGTM.\r
+\r
+Jani.\r
+\r
+\r
+>\r
+> commit 4cbd366d3cd29b5d26b36f3744c26b0853b23437\r
+> Author: David Bremner <bremner@debian.org>\r
+> Date:   Sun Dec 9 08:49:29 2012 -0400\r
+>\r
+>     remove unused sigatomic_t from notmuch-restore\r
+>     \r
+>     I guess this must be cut and paste error from Jani's notmuch-tag code\r
+>\r
+> diff --git a/notmuch-restore.c b/notmuch-restore.c\r
+> index dba882b..40596a8 100644\r
+> --- a/notmuch-restore.c\r
+> +++ b/notmuch-restore.c\r
+> @@ -23,7 +23,6 @@\r
+>  #include "tag-util.h"\r
+>  #include "string-util.h"\r
+>  \r
+> -static volatile sig_atomic_t interrupted;\r
+>  static regex_t regex;\r
+>  \r
+>  static int\r
+>\r
+> commit 75b2fab1874fc9f0bab514fe832cfd85d1319877\r
+> Author: David Bremner <bremner@debian.org>\r
+> Date:   Sun Dec 9 08:47:12 2012 -0400\r
+>\r
+>     enum fixup for tag-utils\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index e7233ab..eab482f 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -16,7 +16,7 @@ struct _tag_op_list_t {\r
+>      size_t size;\r
+>  };\r
+>  \r
+> -static int\r
+> +static tag_parse_status_t\r
+>  line_error (tag_parse_status_t status,\r
+>          const char *line,\r
+>          const char *format, ...)\r
+> @@ -31,7 +31,7 @@ line_error (tag_parse_status_t status,\r
+>      return status;\r
+>  }\r
+>  \r
+> -int\r
+> +tag_parse_status_t\r
+>  parse_tag_line (void *ctx, char *line,\r
+>              tag_op_flag_t flags,\r
+>              char **query_string,\r
+> @@ -56,7 +56,7 @@ parse_tag_line (void *ctx, char *line,\r
+>  \r
+>      /* Skip empty and comment lines. */\r
+>      if (*tok == '\0' || *tok == '#') {\r
+> -    ret = 2;\r
+> +    ret = TAG_PARSE_SKIPPED;\r
+>      goto DONE;\r
+>      }\r
+>  \r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r