From 63346107f6c5b894ce367194db456fce5eb7f78b Mon Sep 17 00:00:00 2001 From: david Date: Thu, 21 Feb 2013 18:24:35 +2000 Subject: [PATCH] [Patch v2 2/4] nmbug: use 'notmuch tag --batch' --- e7/72a8265fb6893bb82086d7b51bbeb6339479dd | 119 ++++++++++++++++++++++ 1 file changed, 119 insertions(+) create mode 100644 e7/72a8265fb6893bb82086d7b51bbeb6339479dd diff --git a/e7/72a8265fb6893bb82086d7b51bbeb6339479dd b/e7/72a8265fb6893bb82086d7b51bbeb6339479dd new file mode 100644 index 000000000..fd390e162 --- /dev/null +++ b/e7/72a8265fb6893bb82086d7b51bbeb6339479dd @@ -0,0 +1,119 @@ +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 B950A431FC0 + 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 N8JYgTnVVb0v 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 05862431FAE + for ; Wed, 20 Feb 2013 14:24:53 -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 1U8I5r-00086T-0j; Wed, 20 Feb 2013 18:24:51 -0400 +Received: from bremner by zancas.localnet with local (Exim 4.80) + (envelope-from ) + id 1U8I5l-00028H-AF; Wed, 20 Feb 2013 18:24:45 -0400 +From: david@tethera.net +To: notmuch@notmuchmail.org +Subject: [Patch v2 2/4] nmbug: use 'notmuch tag --batch' +Date: Wed, 20 Feb 2013 18:24:35 -0400 +Message-Id: <1361399077-7737-3-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 be more robust with respect to tags with whitespace and +and other special characters. It also (hopefully) fixes a remaining +bug handling message-ids with whitespace. It should also be +noticeably faster for large sets of changes since it does one exec per +change set as opposed to one exec per tag changed. +--- + devel/nmbug/nmbug | 27 ++++++++++++++++++++++----- + 1 file changed, 22 insertions(+), 5 deletions(-) + +diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug +index befc3d9..73d64fe 100755 +--- a/devel/nmbug/nmbug ++++ b/devel/nmbug/nmbug +@@ -267,6 +267,20 @@ sub do_checkout { + do_sync (action => 'checkout'); + } + ++sub quote_for_xapian { ++ my $str = shift; ++ $str =~ s/"/""/g; ++ return '"' . $str . '"'; ++} ++ ++sub pair_to_batch_line { ++ my ($action, $pair) = @_; ++ ++ # the tag should already be suitably encoded ++ ++ return $action . $ENCPREFIX . $pair->{tag} . ++ ' -- id:' . quote_for_xapian ($pair->{id})."\n"; ++} + + sub do_sync { + +@@ -283,17 +297,20 @@ sub do_sync { + $D_action = '-'; + } + +- foreach my $pair (@{$status->{added}}) { ++ my $notmuch = spawn ({}, '|-', qw/notmuch tag --batch/) ++ or die 'notmuch tag --batch'; + +- notmuch ('tag', $A_action.$TAGPREFIX.$pair->{tag}, +- 'id:'.$pair->{id}); ++ foreach my $pair (@{$status->{added}}) { ++ print $notmuch pair_to_batch_line ($A_action, $pair); + } + + foreach my $pair (@{$status->{deleted}}) { +- notmuch ('tag', $D_action.$TAGPREFIX.$pair->{tag}, +- 'id:'.$pair->{id}); ++ print $notmuch pair_to_batch_line ($D_action, $pair); + } + ++ unless (close $notmuch) { ++ die "'notmuch tag --batch' exited with nonzero value\n"; ++ } + } + + +-- +1.7.10.4 + -- 2.26.2