[PATCH 4 of 4] mpatch: implement cffi version of mpatch

Martijn Pieters mj at zopatista.com
Wed Jun 22 08:24:56 EDT 2016


On 22 June 2016 at 08:06, Maciej Fijalkowski <fijall at gmail.com> wrote:
> This seems to be the diff necessary (to Augie's wip branch)
>
> https://paste.pound-python.org/show/CMz1afIMKS0r7369G3Jr/
>
> This fails test-check-py3 for stupid reasons.

Might it be because

  from __future__ import absolute_import

is missing from the top of the module?

> Augie: how should I submit that patch, given all the rebasing and stuff?
>
> Best regards,
> Maciej Fijalkowski
>
> On Tue, Jun 21, 2016 at 1:55 PM, Yuya Nishihara <yuya at tcha.org> wrote:
>> On Mon, 20 Jun 2016 17:04:25 +0200, Maciej Fijalkowski wrote:
>>> er ok, so there is no good way to do imports that way? At least I
>>> didn't find any that would not make the linter barf (using from
>>> mercurial). Can we do something that special cases ".." here?
>>
>>> >> >>> +from .. import modulepolicy, policynocffi
>>> >> >>> +
>>> >> >>> from . import pycompat
>>
>> from . import (
>>     policy,
>>     pycompat,
>> )
>>
>> I don't know if it works for mercurial/__init__.py, but we won't have to
>> care because modulepolicy constants has been moved to policy.py.
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel



-- 
Martijn Pieters


More information about the Mercurial-devel mailing list