From 60e544160a89f59210165f6587559e752872945a Mon Sep 17 00:00:00 2001 From: david Date: Thu, 21 Feb 2013 18:24:34 +2000 Subject: [PATCH] [Patch v2 1/4] nmbug: use dump --format=batch-tag --- 30/bff05aca47fb0f04d9117fd67ccc06411c7c0d | 131 ++++++++++++++++++++++ 1 file changed, 131 insertions(+) create mode 100644 30/bff05aca47fb0f04d9117fd67ccc06411c7c0d diff --git a/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d b/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d new file mode 100644 index 000000000..074638f55 --- /dev/null +++ b/30/bff05aca47fb0f04d9117fd67ccc06411c7c0d @@ -0,0 +1,131 @@ +Return-Path: +X-Original-To: notmuch@notmuchmail.org +Delivered-To: notmuch@notmuchmail.org +Received: from localhost (localhost [127.0.0.1]) + by olra.theworths.org (Postfix) with ESMTP id C3A75431FC2 + for ; Wed, 20 Feb 2013 14:24:54 -0800 (PST) +X-Virus-Scanned: Debian amavisd-new at olra.theworths.org +X-Spam-Flag: NO +X-Spam-Score: 0 +X-Spam-Level: +X-Spam-Status: No, score=0 tagged_above=-999 required=5 tests=[none] + autolearn=disabled +Received: from olra.theworths.org ([127.0.0.1]) + by localhost (olra.theworths.org [127.0.0.1]) (amavisd-new, port 10024) + with ESMTP id koSFqtgl1+xC for ; + Wed, 20 Feb 2013 14:24:54 -0800 (PST) +Received: from tesseract.cs.unb.ca (tesseract.cs.unb.ca [131.202.240.238]) + (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) + (No client certificate requested) + by olra.theworths.org (Postfix) with ESMTPS id 0963F431FB6 + for ; Wed, 20 Feb 2013 14:24:54 -0800 (PST) +Received: from fctnnbsc30w-156034082078.dhcp-dynamic.fibreop.nb.bellaliant.net + ([156.34.82.78] helo=zancas.localnet) + by tesseract.cs.unb.ca with esmtpsa + (TLS1.2:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.80) + (envelope-from ) + id 1U8I5q-00086R-OM; Wed, 20 Feb 2013 18:24:51 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1U8I5l-00028C-1I; Wed, 20 Feb 2013 18:24:45 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 1/4] nmbug: use dump --format=batch-tag +Date: Wed, 20 Feb 2013 18:24:34 -0400 +Message-Id: <1361399077-7737-2-git-send-email-david@tethera.net> +X-Mailer: git-send-email 1.7.10.4 +In-Reply-To: <1361399077-7737-1-git-send-email-david@tethera.net> +References: <1361399077-7737-1-git-send-email-david@tethera.net> +X-Spam_bar: - +Cc: David Bremner +X-BeenThere: notmuch@notmuchmail.org +X-Mailman-Version: 2.1.13 +Precedence: list +List-Id: "Use and development of the notmuch mail system." + +List-Unsubscribe: , + +List-Archive: +List-Post: +List-Help: +List-Subscribe: , + +X-List-Received-Date: Wed, 20 Feb 2013 22:24:55 -0000 + +From: David Bremner + +This should make nmbug tolerate tags with whitespace and other special +characters it. At the moment this relies on _not_ passing calls to +notmuch tag through the shell, which is a documented feature of perl's +system function. +--- + devel/nmbug/nmbug | 27 ++++++++++++++++++++------- + 1 file changed, 20 insertions(+), 7 deletions(-) + +diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug +index fe103b3..befc3d9 100755 +--- a/devel/nmbug/nmbug ++++ b/devel/nmbug/nmbug +@@ -39,6 +39,11 @@ my %command = ( + status => \&do_status, + ); + ++# Convert prefix into form suitable for literal matching against ++# notmuch dump --format=batch-tag output. ++my $ENCPREFIX = encode_for_fs ($TAGPREFIX); ++$ENCPREFIX =~ s/:/%3a/g; ++ + my $subcommand = shift || usage (); + + if (!exists $command{$subcommand}) { +@@ -203,9 +208,9 @@ sub index_tags { + + my $index = $NMBGIT.'/nmbug.index'; + +- my $query = join ' ', map ("tag:$_", get_tags ($TAGPREFIX)); ++ my $query = join ' ', map ("tag:\"$_\"", get_tags ($TAGPREFIX)); + +- my $fh = spawn ('-|', qw/notmuch dump --/, $query) ++ my $fh = spawn ('-|', qw/notmuch dump --format=batch-tag --/, $query) + or die "notmuch dump: $!"; + + git ('read-tree', '--empty'); +@@ -214,22 +219,30 @@ sub index_tags { + or die 'git update-index'; + + while (<$fh>) { +- m/ ( [^ ]* ) \s+ \( ([^\)]* ) \) /x || die 'syntax error in dump'; +- my ($id,$rest) = ($1,$2); + +- #strip prefixes before writing +- my @tags = grep { s/^$TAGPREFIX//; } split (' ', $rest); ++ chomp(); ++ my ($rest,$id) = split(/ -- id:/); ++ ++ if ($id =~ s/^"(.*)"\s*$/$1/) { ++ # xapian quoted string, dequote. ++ $id =~ s/""/"/g; ++ } ++ ++ #strip prefixes from tags before writing ++ my @tags = grep { s/^[+]$ENCPREFIX//; } split (' ', $rest); + index_tags_for_msg ($git,$id, 'A', @tags); + } + unless (close $git) { + die "'git update-index --index-info' exited with nonzero value\n"; + } + unless (close $fh) { +- die "'notmuch dump -- $query' exited with nonzero value\n"; ++ die "'notmuch dump --format=batch-tag -- $query' exited with nonzero value\n"; + } + return $index; + } + ++# update the git index to either create or delete an empty file. ++# Neither argument should be encoded/escaped. + sub index_tags_for_msg { + my $fh = shift; + my $msgid = shift; +-- +1.7.10.4 + -- 2.26.2