https://bz.mercurial-scm.org/show_bug.cgi?id=5655
Bug ID: 5655
Summary: Crash on mips64el
Product: Mercurial
Version: 4.3
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: Mercurial
Assignee: bugzi...@mercurial-scm.org
Reporter: mithra...@mithrandi.net
CC: mercurial-devel@mercurial-scm.org
This only seems to happen with the C extensions built on mips64el:
Traceback (most recent call last):
File "../../../../../hg", line 45, in <module>
mercurial.dispatch.run()
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 81, in run
status = (dispatch(req) or 0) & 255
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 162, in
dispatch
ret = _runcatch(req)
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 302, in
_runcatch
return _callcatch(ui, _runcatchfunc)
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 310, in
_callcatch
return scmutil.callcatch(ui, func)
File "/home/mithrandi/mercurial-4.3.1/mercurial/scmutil.py", line 150, in
callcatch
return func()
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 292, in
_runcatchfunc
return _dispatch(req)
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 896, in
_dispatch
cmdpats, cmdoptions)
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 658, in
runcommand
ret = _runcommand(ui, options, cmd, d)
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 904, in
_runcommand
return cmdfunc()
File "/home/mithrandi/mercurial-4.3.1/mercurial/dispatch.py", line 893, in
<lambda>
d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/home/mithrandi/mercurial-4.3.1/mercurial/util.py", line 1079, in check
return func(*args, **kwargs)
File "/home/mithrandi/mercurial-4.3.1/mercurial/commands.py", line 5370, in
update
updatecheck=updatecheck)
File "/home/mithrandi/mercurial-4.3.1/mercurial/hg.py", line 778, in
updatetotally
ret = _update(repo, checkout, updatecheck=updatecheck)
File "/home/mithrandi/mercurial-4.3.1/mercurial/hg.py", line 715, in update
stats = updaterepo(repo, node, False, updatecheck=updatecheck)
File "/home/mithrandi/mercurial-4.3.1/mercurial/hg.py", line 711, in
updaterepo
updatecheck=updatecheck)
File "/home/mithrandi/mercurial-4.3.1/mercurial/merge.py", line 1629, in
update
followcopies, matcher=matcher, mergeforce=mergeforce)
File "/home/mithrandi/mercurial-4.3.1/mercurial/merge.py", line 987, in
calculateupdates
acceptremote, followcopies)
File "/home/mithrandi/mercurial-4.3.1/mercurial/merge.py", line 852, in
manifestmerge
for f, ((n1, fl1), (n2, fl2)) in diff.iteritems():
TypeError: 'NoneType' object is not iterable
At this point, `diff` is this:
{'new': (('T\xe5453\x1bB\x88V\xb7\xd6\x91B\xfc\xea5\x0fL\x1e\x0e', ''), (None,
'')), 'base': None, 'old': None}
I would guess this is a bug in the mercurial/cext/manifest.c but I'm a bit out
of my depth tracking it down. (To reproduce, you can run one of the many
failing tests on mips64el, for example test-obsolete-checkheads.t)
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
