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