On Thu, Jul 25, 2019 at 08:56:19AM +0200, Sebastien Marie wrote:
> On Thu, Jul 25, 2019 at 12:31:53AM +0200, Juan Francisco Cantero Hurtado
> wrote:
> > This is a patch for mercurial users.
> >
> > If you want to test mercurial running with python3 instead of python2.7,
> > uninstall mercurial, apply the patch and run:
> >
> > env FLAVOR=python3 make install
> >
> > If something is broken in the python3 version, please report the problem
> > to the mercurial bugzilla and CC my email. If you're using python2(-only)
> > extensions, these will not work with the python3 version.
>
> while testing python3, I found a problem (I am about to report it), and
> I would like to test the py2 version in order to be sure it is really
> related to py3.
>
> But it seems it doesn't run. I installed it with just "make install" :
There is a missing dependency. I will send a port for the new dep.
>
> $ hg -h
> Traceback (most recent call last):
> File "/usr/local/bin/hg", line 43, in <module>
> dispatch.run()
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 150, in __getattr__
> self._load()
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 94, in _load
> _origimport, head, globals, locals, None, level)
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 43, in _hgextimport
> return importfunc(name, globals, *args, **kwargs)
> File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line
> 22, in <module>
> from .i18n import _
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 248, in _demandimport
> level=level)
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 43, in _hgextimport
> return importfunc(name, globals, *args, **kwargs)
> File "/usr/local/lib/python2.7/site-packages/mercurial/i18n.py", line 24,
> in <module>
> module = pycompat.fsencode(__file__)
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 150, in __getattr__
> self._load()
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 94, in _load
> _origimport, head, globals, locals, None, level)
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 43, in _hgextimport
> return importfunc(name, globals, *args, **kwargs)
> File "/usr/local/lib/python2.7/site-packages/mercurial/pycompat.py", line
> 31, in <module>
> from .thirdparty.concurrent import futures
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 248, in _demandimport
> level=level)
> File
> "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py",
> line 43, in _hgextimport
> return importfunc(name, globals, *args, **kwargs)
> ImportError: No module named concurrent
>
> Same result if I backout my ~/.hgrc .
>
> Thanks.
>
> > Index: Makefile
> > ===================================================================
> > --- Makefile (revision 139554)
> > +++ Makefile (working copy)
> > @@ -5,7 +5,7 @@
> >
> > # Keep in sync with:
> > # devel/tortoisehg
> > -MODPY_EGG_VERSION = 5.0.2
> > +MODPY_EGG_VERSION = 5.1rc0
> > DISTNAME = mercurial-${MODPY_EGG_VERSION}
> > CATEGORIES = devel
> >
> > @@ -39,6 +39,12 @@
> > RUN_DEPENDS-x11 += ${BASE_PKGPATH},-main \
> > ${MODTK_RUN_DEPENDS}
> >
> > +FLAVORS = python3
> > +FLAVOR ?=
> > +.if ${FLAVOR:Mpython3}
> > +MAKE_ENV += HGPYTHON3=1
> > +.endif
> > +
> > FILES = hgeditor hgweb.cgi
> >
> > CONTRIBFILES = bash_completion mercurial.el \
>
> --
> Sebastien Marie
>
--
Juan Francisco Cantero Hurtado http://juanfra.info
