Re: [PATCH v3] nmbug: Translate to Python

diff --git a/0c/d88032a5c88f53158effcb0a388bb4b85622a6 b/0c/d88032a5c88f53158effcb0a388bb4b85622a6
new file mode 100644 (file)
index 0000000..cb7ae70
--- /dev/null
+++ b/0c/d88032a5c88f53158effcb0a388bb4b85622a6
@@ -0,0 +1,83 @@
+Return-Path: <david@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 712CE431FBC\r
+       for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 18:24:23 -0700 (PDT)\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 W6-I7HXUez5h for <notmuch@notmuchmail.org>;\r
+       Tue,  5 Aug 2014 18:24:18 -0700 (PDT)\r
+Received: from yantan.tethera.net (yantan.tethera.net [199.188.72.155])\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 BA858431FAE\r
+       for <notmuch@notmuchmail.org>; Tue,  5 Aug 2014 18:24:18 -0700 (PDT)\r
+Received: from remotemail by yantan.tethera.net with local (Exim 4.80)\r
+       (envelope-from <david@tethera.net>)\r
+       id 1XEpxg-0005vI-1I; Tue, 05 Aug 2014 22:24:16 -0300\r
+Received: (nullmailer pid 7648 invoked by uid 1000); Wed, 06 Aug 2014\r
+       01:24:10 -0000\r
+From: David Bremner <bremner@debian.org>\r
+To: "W. Trevor King" <wking@tremily.us>, notmuch@notmuchmail.org\r
+Subject: Re: [PATCH v3] nmbug: Translate to Python\r
+In-Reply-To: <878un36bd5.fsf@maritornes.cs.unb.ca>\r
+References:\r
+ <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>\r
+       <878un36bd5.fsf@maritornes.cs.unb.ca>\r
+User-Agent: Notmuch/0.18.1+62~g0c12920 (http://notmuchmail.org) Emacs/24.3.1\r
+       (x86_64-pc-linux-gnu)\r
+Date: Tue, 05 Aug 2014 22:24:10 -0300\r
+Message-ID: <871tsue7gl.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: text/plain\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, 06 Aug 2014 01:24:23 -0000\r
+\r
+David Bremner <bremner@debian.org> writes:\r
+\r
+\r
+> I did notice that merging was noticably noisier than I remembered. \r
+>\r
+\r
+Hmm. I just noticed hit another problem with merge. I have a local\r
+commit that deletes a couple tags; when I attempt to merge I get\r
+complaints about local changes to files. \r
+\r
+error: Your local changes to the following files would be overwritten by merge:\r
+       tags/1406859003-11561-2-git-send-email-amdragon@mit.edu/needs-review\r
+       tags/1406859003-11561-3-git-send-email-amdragon@mit.edu/needs-review\r
+Please, commit your changes or stash them before you can merge.\r
+Aborting\r
+Traceback (most recent call last):\r
+  File "/home/bremner/config/scripts/nmbug", line 766, in <module>\r
+    args.func(**kwargs)\r
+  File "/home/bremner/config/scripts/nmbug", line 437, in merge\r
+    wait=True)\r
+  File "/home/bremner/config/scripts/nmbug", line 210, in _git\r
+    return _spawn(args=args, **kwargs)\r
+  File "/home/bremner/config/scripts/nmbug", line 193, in _spawn\r
+    args=args, status=status, stdout=stdout, stderr=stderr)\r
+__main__.SubprocessError: ['git', '--git-dir', '/home/bremner/.nmbug',\r
+       'merge', '@{upstream}'] exited with 128\r
+\r
+Calling the perl version of nmbug successfully creates a little \r
+diamond merge\r
+\r