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

diff --git a/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d b/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d
new file mode 100644 (file)
index 0000000..074638f
--- /dev/null
+++ b/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d
@@ -0,0 +1,131 @@
+Return-Path: <bremner@tethera.net>\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 C3A75431FC2\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Feb 2013 14:24:54 -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 koSFqtgl1+xC for <notmuch@notmuchmail.org>;\r
+       Wed, 20 Feb 2013 14:24:54 -0800 (PST)\r
+Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238])\r
+       (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits))\r
+       (No client certificate requested)\r
+       by olra.theworths.org (Postfix) with ESMTPS id 0963F431FB6\r
+       for <notmuch@notmuchmail.org>; Wed, 20 Feb 2013 14:24:54 -0800 (PST)\r
+Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net\r
+       ([156.34.82.78] helo=zancas.localnet)\r
+       by tesseract.cs.unb.ca with esmtpsa\r
+       (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1U8I5q-00086R-OM; Wed, 20 Feb 2013 18:24:51 -0400\r
+Received: from bremner by zancas.localnet with local (Exim 4.80)\r
+       (envelope-from <bremner@tethera.net>)\r
+       id 1U8I5l-00028C-1I; Wed, 20 Feb 2013 18:24:45 -0400\r
+From: david@tethera.net\r
+To: notmuch@notmuchmail.org\r
+Subject: [Patch v2 1/4] nmbug: use dump --format=batch-tag\r
+Date: Wed, 20 Feb 2013 18:24:34 -0400\r
+Message-Id: <1361399077-7737-2-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 1.7.10.4\r
+In-Reply-To: <1361399077-7737-1-git-send-email-david@tethera.net>\r
+References: <1361399077-7737-1-git-send-email-david@tethera.net>\r
+X-Spam_bar: -\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: Wed, 20 Feb 2013 22:24:55 -0000\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
+ 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