Re: [Patch v2 1/4] nmbug: use dump --format=batch-tag

diff --git a/b6/d8b4aa41ee645e49b9f44be2324416f88bcc7b b/b6/d8b4aa41ee645e49b9f44be2324416f88bcc7b
new file mode 100644 (file)
index 0000000..f0479dd
--- /dev/null
+++ b/b6/d8b4aa41ee645e49b9f44be2324416f88bcc7b
@@ -0,0 +1,166 @@
+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 olra.theworths.org (Postfix) with ESMTP id 7CC48431FB6\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Feb 2013 00:31:04 -0800 (PST)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: 0\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none]\r
+       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 bX7j-rko0Q7g for <notmuch@notmuchmail.org>;\r
+       Thu, 21 Feb 2013 00:31:00 -0800 (PST)\r
+Received: from guru.guru-group.fi (guru.guru-group.fi [46.183.73.34])\r
+       by olra.theworths.org (Postfix) with ESMTP id 485F2431FAE\r
+       for <notmuch@notmuchmail.org>; Thu, 21 Feb 2013 00:31:00 -0800 (PST)\r
+Received: from guru.guru-group.fi (localhost [IPv6:::1])\r
+       by guru.guru-group.fi (Postfix) with ESMTP id 9CD8510014F;\r
+       Thu, 21 Feb 2013 10:30:47 +0200 (EET)\r
+From: Tomi Ollila <tomi.ollila@iki.fi>\r
+To: david@tethera.net, notmuch@notmuchmail.org\r
+Subject: Re: [Patch v2 1/4] nmbug: use dump --format=batch-tag\r
+In-Reply-To: <1361399077-7737-2-git-send-email-david@tethera.net>\r
+References: <1361399077-7737-1-git-send-email-david@tethera.net>\r
+       <1361399077-7737-2-git-send-email-david@tethera.net>\r
+User-Agent: Notmuch/0.15.2+41~g0ce9bd4 (http://notmuchmail.org) Emacs/24.2.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: Thu, 21 Feb 2013 10:30:47 +0200\r
+Message-ID: <m27gm2ax1k.fsf@guru.guru-group.fi>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\r
+Cc: David Bremner <bremner@debian.org>\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: Thu, 21 Feb 2013 08:31:04 -0000\r
+\r
+On Thu, Feb 21 2013, david@tethera.net wrote:\r
+\r
+> From: David Bremner <bremner@debian.org>\r
+>\r
+> This should make nmbug tolerate tags with whitespace and other special\r
+> characters it.  At the moment this relies on _not_ passing calls to\r
+> notmuch tag through the shell, which is a documented feature of perl's\r
+> system function.\r
+\r
+This patch series looks good to me (as far as I can understand, I did\r
+not find the "silly bug" in your previous patch...)\r
+\r
+Instead of mentioning that "calls are _not_ passed to shell" here,\r
+that could be briefly mentioned just before system() calls in the\r
+script -- and that definitely should not be 'At the moment' feature.\r
+\r
+the system() function in perl(1) never pass execution through the\r
+shell in case the args are list more than one arg:\r
+\r
+1 $ perl -e 'system( qw/echo |cat; echo second line ?/ )'\r
+|cat; echo second line ?\r
+\r
+2 $ perl -le 'system( qw/echo| cat;/ ); print "system: ",$!'\r
+system: No such file or directory\r
+\r
+3 $ perl -le 'system( qw/echo|/ ); print "system: ",$!'\r
+sh: -c: line 1: syntax error: unexpected end of file\r
+system:\r
+\r
+execve calls to the above could have been:\r
+\r
+1: execve( "/bin/echo" [ "echo" "|cat;" "echo" "second" "line" "?" ] )\r
+\r
+2: no execve: perl(1) did not find 'echo|' in the PATH\r
+\r
+3: execve( "/bin/sh" [ "sh" "-c" "echo|" ] )\r
+\r
+Tomi\r
+\r
+> ---\r
+>  devel/nmbug/nmbug |   27 ++++++++++++++++++++-------\r
+>  1 file changed, 20 insertions(+), 7 deletions(-)\r
+>\r
+> diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+> index fe103b3..befc3d9 100755\r
+> --- a/devel/nmbug/nmbug\r
+> +++ b/devel/nmbug/nmbug\r
+> @@ -39,6 +39,11 @@ my %command = (\r
+>           status     => \&do_status,\r
+>           );\r
+>  \r
+> +# Convert prefix into form suitable for literal matching against\r
+> +# notmuch dump --format=batch-tag output.\r
+> +my $ENCPREFIX = encode_for_fs ($TAGPREFIX);\r
+> +$ENCPREFIX =~ s/:/%3a/g;\r
+> +\r
+>  my $subcommand = shift || usage ();\r
+>  \r
+>  if (!exists $command{$subcommand}) {\r
+> @@ -203,9 +208,9 @@ sub index_tags {\r
+>  \r
+>    my $index = $NMBGIT.'/nmbug.index';\r
+>  \r
+> -  my $query = join ' ', map ("tag:$_", get_tags ($TAGPREFIX));\r
+> +  my $query = join ' ', map ("tag:\"$_\"", get_tags ($TAGPREFIX));\r
+>  \r
+> -  my $fh = spawn ('-|', qw/notmuch dump --/, $query)\r
+> +  my $fh = spawn ('-|', qw/notmuch dump --format=batch-tag --/, $query)\r
+>      or die "notmuch dump: $!";\r
+>  \r
+>    git ('read-tree', '--empty');\r
+> @@ -214,22 +219,30 @@ sub index_tags {\r
+>      or die 'git update-index';\r
+>  \r
+>    while (<$fh>) {\r
+> -    m/ ( [^ ]* ) \s+ \( ([^\)]* ) \) /x || die 'syntax error in dump';\r
+> -    my ($id,$rest) = ($1,$2);\r
+>  \r
+> -    #strip prefixes before writing\r
+> -    my @tags = grep { s/^$TAGPREFIX//; } split (' ', $rest);\r
+> +    chomp();\r
+> +    my ($rest,$id) = split(/ -- id:/);\r
+> +\r
+> +    if ($id =~ s/^"(.*)"\s*$/$1/) {\r
+> +      # xapian quoted string, dequote.\r
+> +      $id =~ s/""/"/g;\r
+> +    }\r
+> +\r
+> +    #strip prefixes from tags before writing\r
+> +    my @tags = grep { s/^[+]$ENCPREFIX//; } split (' ', $rest);\r
+>      index_tags_for_msg ($git,$id, 'A', @tags);\r
+>    }\r
+>    unless (close $git) {\r
+>      die "'git update-index --index-info' exited with nonzero value\n";\r
+>    }\r
+>    unless (close $fh) {\r
+> -    die "'notmuch dump -- $query' exited with nonzero value\n";\r
+> +    die "'notmuch dump --format=batch-tag -- $query' exited with nonzero value\n";\r
+>    }\r
+>    return $index;\r
+>  }\r
+>  \r
+> +# update the git index to either create or delete an empty file.\r
+> +# Neither argument should be encoded/escaped.\r
+>  sub index_tags_for_msg {\r
+>    my $fh = shift;\r
+>    my $msgid = shift;\r
+> -- \r
+> 1.7.10.4\r
+>\r
+> _______________________________________________\r
+> notmuch mailing list\r
+> notmuch@notmuchmail.org\r
+> http://notmuchmail.org/mailman/listinfo/notmuch\r