Re: [PATCH v3] nmbug: Translate to Python

diff --git a/2a/271abc305054d4c2407dd57afd32d7833ecfdc b/2a/271abc305054d4c2407dd57afd32d7833ecfdc
new file mode 100644 (file)
index 0000000..4e87c3a
--- /dev/null
+++ b/2a/271abc305054d4c2407dd57afd32d7833ecfdc
@@ -0,0 +1,145 @@
+Return-Path: <wking@tremily.us>\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 185A0431FBD\r
+       for <notmuch@notmuchmail.org>; Wed,  6 Aug 2014 16:38:10 -0700 (PDT)\r
+X-Virus-Scanned: Debian amavisd-new at olra.theworths.org\r
+X-Spam-Flag: NO\r
+X-Spam-Score: -0.1\r
+X-Spam-Level: \r
+X-Spam-Status: No, score=-0.1 tagged_above=-999 required=5\r
+       tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1,\r
+       RCVD_IN_DNSWL_NONE=-0.0001] 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 DOYSmlRl39gQ for <notmuch@notmuchmail.org>;\r
+       Wed,  6 Aug 2014 16:38:06 -0700 (PDT)\r
+Received: from qmta05.emeryville.ca.mail.comcast.net\r
+       (qmta05.emeryville.ca.mail.comcast.net [76.96.30.48])\r
+       by olra.theworths.org (Postfix) with ESMTP id C35EA431FAE\r
+       for <notmuch@notmuchmail.org>; Wed,  6 Aug 2014 16:38:05 -0700 (PDT)\r
+Received: from omta16.emeryville.ca.mail.comcast.net ([76.96.30.72])\r
+       by qmta05.emeryville.ca.mail.comcast.net with comcast\r
+       id bZ1g1o0021ZMdJ4A5be5EE; Wed, 06 Aug 2014 23:38:05 +0000\r
+Received: from odin.tremily.us ([24.18.63.50])\r
+       by omta16.emeryville.ca.mail.comcast.net with comcast\r
+       id bbe41o00H152l3L8cbe4hS; Wed, 06 Aug 2014 23:38:04 +0000\r
+Received: by odin.tremily.us (Postfix, from userid 1000)\r
+       id 136C812BD9ED; Wed,  6 Aug 2014 16:38:03 -0700 (PDT)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=tremily.us; s=odin;\r
+       t=1407368284; bh=dRVPNVx7hSLRQVsOuZjbPq106GJIJENr2uxKVWbjOaU=;\r
+       h=Date:From:To:Cc:Subject:References:In-Reply-To;\r
+       b=d8MaHk4BFvNtZSkxDYYNAZDPhxejMk+kyhYRDQi+ahivFf5MIvOU9ioxLXv0aQEWH\r
+       mm/i4jgMEl9yaPF7fLDdwgYq1k777veXaX/8HdjAr+W8mlmf8OAngnG68un+yzmLvq\r
+       y3CPtKqH/94hBgmZDtwP2Z92gUCh1NWupZ4Foa/I=\r
+Date: Wed, 6 Aug 2014 16:38:03 -0700\r
+From: "W. Trevor King" <wking@tremily.us>\r
+To: David Bremner <bremner@debian.org>\r
+Subject: Re: [PATCH v3] nmbug: Translate to Python\r
+Message-ID: <20140806233803.GJ31313@odin.tremily.us>\r
+References:\r
+ <84447a0ed48412e1587761d560d18cb5affd4f66.1405897133.git.wking@tremily.us>\r
+       <878un36bd5.fsf@maritornes.cs.unb.ca>   <871tsue7gl.fsf@maritornes.cs.unb.ca>\r
+MIME-Version: 1.0\r
+Content-Type: multipart/signed; micalg=pgp-sha1;\r
+       protocol="application/pgp-signature"; boundary="j+MD90OnwjQyWNYt"\r
+Content-Disposition: inline\r
+In-Reply-To: <871tsue7gl.fsf@maritornes.cs.unb.ca>\r
+OpenPGP: id=39A2F3FA2AB17E5D8764F388FC29BDCDF15F5BE8;\r
+       url=http://tremily.us/pubkey.txt\r
+User-Agent: Mutt/1.5.23 (2014-03-12)\r
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=comcast.net;\r
+       s=q20140121; t=1407368285;\r
+       bh=bx2nWnZgbfThGoQ8EE4SGUSFFXrxdEkLUByat+fcB/Q=;\r
+       h=Received:Received:Received:Date:From:To:Subject:Message-ID:\r
+       MIME-Version:Content-Type;\r
+       b=shcjw7TX9N6AXbDAs2AgAwDHk9CMC9OzueA8s216atFJ3H4j15AwnlJmSqI5N/8Ag\r
+       mUra9m6l8FC3XIeP8A028nFHxNiwmZvXNYvLQh8Ix7lDOXyugNOdqYfPF+zTID/q86\r
+       PdyGkYSGOZZ5n6pvaSvsJwW/QGpsXHxXeQb/xVCG/CPDX4VDgUs5wbDxVCexBT8T8u\r
+       Njj6dkuVOVs/wvj4B2uWFWgYSxkuJsKvshoD1cECq5GV85bJ1r91MIUlH747WPCnm3\r
+       fhA7hxffYX7a371ShjAa2pKpuQ9f0qEhq9XdQd/hnavSoW/o7EwObqn9NDcW1gcPAr\r
+       +kpCbzT4zXSNw==\r
+Cc: notmuch@notmuchmail.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, 06 Aug 2014 23:38:10 -0000\r
+\r
+\r
+--j+MD90OnwjQyWNYt\r
+Content-Type: text/plain; charset=utf-8\r
+Content-Disposition: inline\r
+Content-Transfer-Encoding: quoted-printable\r
+\r
+On Tue, Aug 05, 2014 at 10:24:10PM -0300, David Bremner wrote:\r
+> I have a local commit that deletes a couple tags; when I attempt to\r
+> merge I get complaints about local changes to files.\r
+>=20\r
+> error: Your local changes to the following files would be overwritten by =\r
+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
+> =E2=80=A6\r
+> Calling the perl version of nmbug successfully creates a little=20\r
+> diamond merge\r
+\r
+The Perl version has:\r
+\r
+  git ( { GIT_WORK_TREE =3D> $tempwork }, 'checkout', '-f', 'HEAD');\r
+  git ( { GIT_WORK_TREE =3D> $tempwork }, 'merge', $commit);\r
+\r
+But the Python version only has:\r
+\r
+  _git(\r
+      args=3D['merge', reference],\r
+      additional_env=3D{'GIT_WORK_TREE': workdir},\r
+      wait=3DTrue)\r
+\r
+I suppose we need the checkout to populate the working directory, but\r
+I'm not sure we want to force the checkout.  Do we expect to have\r
+unmerged entries in the index?\r
+\r
+I'll add an unforced checkout here in v4.  I'll add it to pull() too,\r
+now that it's decoupled from nmbug's merge implementation.\r
+\r
+Cheers,\r
+Trevor\r
+\r
+--=20\r
+This email may be signed or encrypted with GnuPG (http://www.gnupg.org).\r
+For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy\r
+\r
+--j+MD90OnwjQyWNYt\r
+Content-Type: application/pgp-signature; name="signature.asc"\r
+Content-Description: OpenPGP digital signature\r
+\r
+-----BEGIN PGP SIGNATURE-----\r
+Version: GnuPG v2\r
+\r
+iQIcBAEBAgAGBQJT4rxaAAoJEG8/JgBt8ol89w4P/0mT2kW8JfYa6t8t+3YpY2rj\r
+rHWfa6wv47LBKkL3QP0mQWlXC7WcMWRnQKQK+2CUXkxjlejd/TNeVZllXzvQWvfP\r
+HH2ziwuOqFTI3OZK6tQy1mCn73YkLwkejXKhBY2JcNsEdpKJ7qx6rVyJvIC1S60o\r
+flFS83fG4DNUTXDP/h5CCl3cd9WxTWct5yBvokv2nETfhjddn0N3sVKDGib6zdnK\r
+i4e4FD1HQCmJnzG5dRLZ7qyLk7wo4C3L1kRM7mnznjCOU8yEWDA6OuAHMCPEnPug\r
+6yjeIK2x1ltgIvEkxqpt3RTFnsK5Ue/RbcwVscUX/iVuiCcWyYAC4BatbWbTnigi\r
+QpLTc6yYNQcyXnSQnNNZdHj0bAlJiuwT0JeahkNWHkXbeXRipSPQrjipwk3UHgWY\r
+JolEP0gjucCmt1xTtjRaElkXRwekf1i/JKYGgxLK9ocY+6BN8YPXN3WI39VP0T9G\r
+Lp1TauSVBojEXpl7DJyg2XYJdk2XPeZMs7QMDJ+/EkLmZV5Hpx7hV7mHKgiT3Y61\r
+AoX+dq1fsyeqXQVKdkniTrMrSVrBJ9hXhc2RmP8+JbzIVfny1JmohYs3/272iK0V\r
+jC+HMIhs/dKvFttKARnXl3keigluAh4bXWhh/xhQlDPc8e0gMIHxMzw6w3i0ICZ2\r
+6PRVDjfUHDGuuIrkwZh/\r
+=wW2K\r
+-----END PGP SIGNATURE-----\r
+\r
+--j+MD90OnwjQyWNYt--\r