[Bug 5641] New: hg commit broken with Pypy 5.6.0

[mercurial-bugs at mercurial-scm.org]

https://bz.mercurial-scm.org/show_bug.cgi?id=5641

            Bug ID: 5641
           Summary: hg commit broken with Pypy 5.6.0
           Product: Mercurial
           Version: 4.3-rc
          Hardware: PC
                OS: Linux
            Status: UNCONFIRMED
          Severity: bug
          Priority: wish
         Component: Mercurial
          Assignee: bugzilla at mercurial-scm.org
          Reporter: lothiraldan at gmail.com
                CC: mercurial-devel at mercurial-scm.org

hg commit seems broken with pypy 5.6.0, I get this traceback when trying to
commit:

> Traceback (most recent call last):
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/scmutil.py", line 150, in callcatch
>     return func()
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/dispatch.py", line 292, in _runcatchfunc
>     return _dispatch(req)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/dispatch.py", line 895, in _dispatch
>     cmdpats, cmdoptions)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgext/journal.py", line 84, in runcommand
>     return orig(lui, repo, cmd, fullargs, *args)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/dispatch.py", line 658, in runcommand
>     ret = _runcommand(ui, options, cmd, d)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/dispatch.py", line 903, in _runcommand
>     return cmdfunc()
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/dispatch.py", line 892, in <lambda>
>     d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/__init__.py", line 615, in commitwrap
>     return orig(ui, repo, *args, **opts)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/evolve/__init__.py", line 2156, in commitwrapper
>     result = orig(ui, repo, *arg, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/evolve/__init__.py", line 765, in warnobserrors
>     ret = orig(ui, repo, *args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 1069, in check
>     return func(*args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/commands.py", line 1486, in commit
>     return _docommit(ui, repo, *pats, **opts)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/commands.py", line 1510, in _docommit
>     bheads = repo.branchheads(branch)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/localrepo.py", line 2094, in branchheads
>     branches = self.branchmap()
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/__init__.py", line 286, in branchmap
>     return self.filtered(topicfilter).branchmap()
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/__init__.py", line 285, in branchmap
>     return super(topicrepo, self).branchmap()
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/localrepo.py", line 914, in branchmap
>     branchmap.updatecache(self)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/topicmap.py", line 109, in _wrapupdatebmcache
>     return orig(repo)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/branchmap.py", line 105, in updatecache
>     partial = subset.branchmap().copy()
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/__init__.py", line 285, in branchmap
>     return super(topicrepo, self).branchmap()
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/localrepo.py", line 914, in branchmap
>     branchmap.updatecache(self)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/extensions.py", line 322, in closure
>     return func(*(args + a), **kw)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/topicmap.py", line 109, in _wrapupdatebmcache
>     return orig(repo)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/branchmap.py", line 110, in updatecache
>     partial.update(repo, revs)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/topicmap.py", line 201, in update
>     super(_topiccache, self).update(repo, revgen)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/branchmap.py", line 266, in update
>     branch, closesbranch = getbranchinfo(r)
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/topicmap.py", line 194, in branchinfo
>     topic = ctx.topic()
>   File "/home/lothiraldan/project/mercurial/evolve/hgext3rd/topic/__init__.py", line 129, in _contexttopic
>     return self.extra().get(constants.extrakey, '')
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/context.py", line 572, in extra
>     return self._changeset.extra
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/util.py", line 815, in __get__
>     result = self.func(obj)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/context.py", line 524, in _changeset
>     return self._repo.changelog.changelogrevision(self.rev())
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/changelog.py", line 476, in changelogrevision
>     return changelogrevision(self.revision(nodeorrev))
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/revlog.py", line 1379, in revision
>     rawtext = mdiff.patches(rawtext, bins)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 146, in __getattr__
>     self._load()
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 91, in _load
>     mod = _hgextimport(_origimport, head, globals, locals, None, level)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 42, in _hgextimport
>     return importfunc(name, globals, *args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/mdiff.py", line 22, in <module>
>     bdiff = policy.importmod(r'bdiff')
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/policy.py", line 98, in importmod
>     mod = _importfrom(verpkg, modname)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/policy.py", line 68, in _importfrom
>     getattr(mod, r'__doc__', None)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 160, in __doc__
>     self._load()
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 91, in _load
>     mod = _hgextimport(_origimport, head, globals, locals, None, level)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 42, in _hgextimport
>     return importfunc(name, globals, *args, **kwargs)
>   File "/home/lothiraldan/project/mercurial/mercurial/mercurial/cffi/bdiff.py", line 15, in <module>
>     ffi = _bdiff.ffi
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 146, in __getattr__
>     self._load()
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 91, in _load
>     mod = _hgextimport(_origimport, head, globals, locals, None, level)
>   File "/home/lothiraldan/project/mercurial/mercurial/hgdemandimport/demandimportpy2.py", line 42, in _hgextimport
>     return importfunc(name, globals, *args, **kwargs)
> ImportError: No module named mercurial.cffi._bdiff
> abort: No module named mercurial.cffi._bdiff!

I tried with hg 4.3-rc and pypy 5.6.0.

-- 
You are receiving this mail because:
You are on the CC list for the bug.