[PATCH] nmbug: ignore # comments

diff --git a/06/3e74929f7317a19f36ca85337e9c3c4a2558e7 b/06/3e74929f7317a19f36ca85337e9c3c4a2558e7
new file mode 100644 (file)
index 0000000..73496e9
--- /dev/null
+++ b/06/3e74929f7317a19f36ca85337e9c3c4a2558e7
@@ -0,0 +1,76 @@
+Return-Path: <bremner@tesseract.cs.unb.ca>\r
+X-Original-To: notmuch@notmuchmail.org\r
+Delivered-To: notmuch@notmuchmail.org\r
+Received: from localhost (localhost [127.0.0.1])\r
+ by arlo.cworth.org (Postfix) with ESMTP id 3678F6DE0222\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Mar 2016 13:25:42 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at cworth.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.015\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.015 tagged_above=-999 required=5\r
+ tests=[AWL=-0.016, HEADER_FROM_DIFFERENT_DOMAINS=0.001]\r
+ autolearn=disabled\r
+Received: from arlo.cworth.org ([127.0.0.1])\r
+ by localhost (arlo.cworth.org [127.0.0.1]) (amavisd-new, port 10024)\r
+ with ESMTP id q-UEzZ1VvkcW for <notmuch@notmuchmail.org>;\r
+ Sun, 27 Mar 2016 13:25:34 -0700 (PDT)\r
+Received: from fethera.tethera.net (fethera.tethera.net [198.245.60.197])\r
+ by arlo.cworth.org (Postfix) with ESMTPS id E99A46DE01F9\r
+ for <notmuch@notmuchmail.org>; Sun, 27 Mar 2016 13:25:33 -0700 (PDT)\r
+Received: from remotemail by fethera.tethera.net with local (Exim 4.84)\r
+ (envelope-from <bremner@tesseract.cs.unb.ca>)\r
+ id 1akHGA-0003Ba-BG; Sun, 27 Mar 2016 16:26:06 -0400\r
+Received: (nullmailer pid 23879 invoked by uid 1000);\r
+ Sun, 27 Mar 2016 20:25:16 -0000\r
+From: David Bremner <david@tethera.net>\r
+To: David Bremner <david@tethera.net>, notmuch@notmuchmail.org\r
+Subject: [PATCH] nmbug: ignore # comments\r
+Date: Sun, 27 Mar 2016 17:25:11 -0300\r
+Message-Id: <1459110311-23774-1-git-send-email-david@tethera.net>\r
+X-Mailer: git-send-email 2.6.4\r
+In-Reply-To: <1459015043-8460-9-git-send-email-david@tethera.net>\r
+References: <1459015043-8460-9-git-send-email-david@tethera.net>\r
+X-BeenThere: notmuch@notmuchmail.org\r
+X-Mailman-Version: 2.1.20\r
+Precedence: list\r
+List-Id: "Use and development of the notmuch mail system."\r
+ <notmuch.notmuchmail.org>\r
+List-Unsubscribe: <https://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: <https://notmuchmail.org/mailman/listinfo/notmuch>,\r
+ <mailto:notmuch-request@notmuchmail.org?subject=subscribe>\r
+X-List-Received-Date: Sun, 27 Mar 2016 20:25:42 -0000\r
+\r
+Lines starting with # have always (for a long time, anyway) been ignored\r
+by notmuch-restore, but have not been generated by notmuch-dump\r
+previously.  In order to make nmbug robust against such output, ignore\r
+comment lines.\r
+---\r
+\r
+ Even if we decide to change the default output of notmuch dump to not\r
+ contain any comments, this fix will be reasonable in terms of\r
+ increasing robustness against future breakage.\r
+\r
+ devel/nmbug/nmbug | 2 ++\r
+ 1 file changed, 2 insertions(+)\r
+\r
+diff --git a/devel/nmbug/nmbug b/devel/nmbug/nmbug\r
+index 81f582c..0787b2b 100755\r
+--- a/devel/nmbug/nmbug\r
++++ b/devel/nmbug/nmbug\r
+@@ -608,6 +608,8 @@ def _index_tags():\r
+                 stdin=_subprocess.PIPE,\r
+                 additional_env={'GIT_INDEX_FILE': path}) as git:\r
+             for line in notmuch.stdout:\r
++                if line.strip().startswith('#'):\r
++                    continue\r
+                 (tags_string, id) = [_.strip() for _ in line.split(' -- id:')]\r
+                 tags = [\r
+                     _unquote(tag[len(prefix):])\r
+-- \r
+2.6.4\r
+\r