Re: [PATCH v3 07/20] tag-util: do not reset list in parse_tag_command_line

diff --git a/c9/a4a2b8aa374fd58b678e4c1ff9339e4576a008 b/c9/a4a2b8aa374fd58b678e4c1ff9339e4576a008
new file mode 100644 (file)
index 0000000..656103b
--- /dev/null
+++ b/c9/a4a2b8aa374fd58b678e4c1ff9339e4576a008
@@ -0,0 +1,118 @@
+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 4A97E431FAF\r
+       for <notmuch@notmuchmail.org>; Mon, 21 Jan 2013 10:09:15 -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 tqGJYpgG3enF for <notmuch@notmuchmail.org>;\r
+       Mon, 21 Jan 2013 10:09:14 -0800 (PST)\r
+Received: from mail-bk0-f48.google.com (mail-bk0-f48.google.com\r
+       [209.85.214.48]) (using TLSv1 with cipher RC4-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 94396431FAE\r
+       for <notmuch@notmuchmail.org>; Mon, 21 Jan 2013 10:09:14 -0800 (PST)\r
+Received: by mail-bk0-f48.google.com with SMTP id jk14so676481bkc.21\r
+       for <notmuch@notmuchmail.org>; Mon, 21 Jan 2013 10:09:13 -0800 (PST)\r
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;\r
+       d=google.com; s=20120113;\r
+       h=x-received:from:to:subject:in-reply-to:references:user-agent:date\r
+       :message-id:mime-version:content-type:x-gm-message-state;\r
+       bh=V1YWDI/hBqeZMU0msR2LbWUnnD+6J1bgDD+G2bbRbmo=;\r
+       b=Tf+giVbpOxyulW+7j6GbmTqJm9aMQt/CqhOg86nDA4ea4bvMo/47Q0C9r4DbtfdM/U\r
+       uo8QB0UONnRh+NdgEPXgJqi3xZdY9gO3QXC574q0xo2BIiBVhnBqBt40ciU5x9FDoCnb\r
+       FwoqXXeRvNDIkSDq7u/15Bh3mIwmzbeJC0wHjDA16Lfx+VPF8R7CseSYWSI4lkiKLT4x\r
+       XqdYSYJovp3MRQHwIXAqjIsniwoW0DhAW0eGNOpPG+3aQXUh5kbyGcgNZSwME6KzkDhJ\r
+       ks9NW1xin8PK1XWr2AZiRpvytyDZZ/661BSyMkm6Sn/fejhnkpJbWLbIz7ZbaufKwkx4\r
+       Ua7w==\r
+X-Received: by 10.204.149.11 with SMTP id r11mr4940260bkv.93.1358791753124;\r
+       Mon, 21 Jan 2013 10:09:13 -0800 (PST)\r
+Received: from localhost ([2001:4b98:dc0:43:216:3eff:fe1b:25f3])\r
+       by mx.google.com with ESMTPS id y11sm9235154bkw.8.2013.01.21.10.09.10\r
+       (version=TLSv1.1 cipher=RC4-SHA bits=128/128);\r
+       Mon, 21 Jan 2013 10:09:11 -0800 (PST)\r
+From: Jani Nikula <jani@nikula.org>\r
+To: Peter Wang <novalazy@gmail.com>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3 07/20] tag-util: do not reset list in\r
+       parse_tag_command_line\r
+In-Reply-To: <1358643004-14522-8-git-send-email-novalazy@gmail.com>\r
+References: <1358643004-14522-1-git-send-email-novalazy@gmail.com>\r
+       <1358643004-14522-8-git-send-email-novalazy@gmail.com>\r
+User-Agent: Notmuch/0.14+259~gdee88db (http://notmuchmail.org) Emacs/23.2.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Mon, 21 Jan 2013 19:09:04 +0100\r
+Message-ID: <878v7m2ytb.fsf@nikula.org>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain; charset=us-ascii\r
+X-Gm-Message-State:\r
+ ALoCoQlVxLKOvt7ikoTdSrVLp6SXrD8pMom0NFKRCS7FKgN49gfJcASisalTuIbJHBW8MEungHAR\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: Mon, 21 Jan 2013 18:09:15 -0000\r
+\r
+On Sun, 20 Jan 2013, Peter Wang <novalazy@gmail.com> wrote:\r
+> No current callers of parse_tag_command_line require that it clear its\r
+> tag list argument.  The notmuch 'insert' command will be better served\r
+> if the function modifies a pre-populated list (of new.tags) instead of\r
+> clobbering it outright.\r
+\r
+I think I'd like parse_tag_command_line() and parse_tag_line() to behave\r
+similarly, both either resetting or not resetting tag list. I think you\r
+could just parse command line first, and add new.tags afterwards, and\r
+you'd be fine without changing parse_tag_command_line().\r
+\r
+> ---\r
+>  tag-util.c | 2 --\r
+>  tag-util.h | 2 ++\r
+>  2 files changed, 2 insertions(+), 2 deletions(-)\r
+>\r
+> diff --git a/tag-util.c b/tag-util.c\r
+> index 701d329..3f9da05 100644\r
+> --- a/tag-util.c\r
+> +++ b/tag-util.c\r
+> @@ -165,8 +165,6 @@ parse_tag_command_line (void *ctx, int argc, char **argv,\r
+>  \r
+>      int i;\r
+>  \r
+> -    tag_op_list_reset (tag_ops);\r
+> -\r
+>      for (i = 0; i < argc; i++) {\r
+>      if (strcmp (argv[i], "--") == 0) {\r
+>          i++;\r
+> diff --git a/tag-util.h b/tag-util.h\r
+> index 246de85..4628f16 100644\r
+> --- a/tag-util.h\r
+> +++ b/tag-util.h\r
+> @@ -81,6 +81,8 @@ parse_tag_line (void *ctx, char *line,\r
+>   * Output Parameters:\r
+>   *  ops     contains a list of tag operations\r
+>   *  query_str the search terms.\r
+> + *\r
+> + * The ops argument is not cleared.\r
+>   */\r
+>  \r
+>  tag_parse_status_t\r
+> -- \r
+> 1.7.12.1\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r