[issue2304] Stack trace and crash when rebasing with moved files

[Marc Weil]

New submission from Marc Weil <marc.weil at gmail.com>:

When trying to rebase 5 mq patches on top of 2000+ changesets, hg crashes
with the following core dump after about 5 minutes. It seems impossible to
actually perform this rebase, meaning the only option is to finialize all
the patches and do a standard merge.

------------

[[..snip..]]

 
pv/projects/bre/TO/src/com/primavera/to/bpm/BPMInstanceGroupByOptionItem.java:
searching for copy revision for
pv/projects/bre/BPMCommon/src/com/primavera/bpm/common/to/BPMInstanceGroupByOptionItem.java

Traceback (most recent call last):
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 54, in _runcatch
    return _dispatch(ui, args)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 483, in _dispatch
    cmdpats, cmdoptions)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 351, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/extensions.py",
line 160, in wrap
    return wrapper(origfn, *args, **kwargs)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/color.py",
line 213, in colorcmd
    return orig(ui_, opts, cmd, cmdfunc)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 534, in _runcommand
    return checkargs()
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 488, in checkargs
    return cmdfunc()
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 481, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/util.py",
line 420, in check
    return func(*args, **kwargs)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/rebase.py",
line 167, in rebase
    newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/rebase.py",
line 282, in concludenode
    date=ctx.date(), extra=extra)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/mq.py",
line 2690, in commit
    editor, extra)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 893, in commit
    ret = self.commitctx(cctx, True)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/bookmarks.py",
line 282, in commitctx
    node  = super(bookmark_repo, self).commitctx(ctx, error)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 940, in commitctx
    changed)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 763, in _filecommit
    self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
TypeError: b2a_hex() argument 1 must be string or read-only buffer, not None
** unknown exception encountered, details follow
** report bug details to http://mercurial.selenic.com/bts/
** or mercurial at selenic.com
** Python 2.6.5 (r265:79063, Apr 16 2010, 13:57:41) [GCC 4.4.3]
** Mercurial Distributed SCM (version 1.6)
** Extensions loaded: progress, fetch, color, graphlog, highlight, mq,
purge, transplant, crecord, rebase, bookmarks, prompt
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 5, in <module>
    pkg_resources.run_script('mercurial==1.6', 'hg')
  File "/usr/lib/python2.6/dist-packages/pkg_resources.py", line 461, in
run_script
    self.require(requires)[0].run_script(script_name, ns)
  File "/usr/lib/python2.6/dist-packages/pkg_resources.py", line 1194, in
run_script
    execfile(script_filename, namespace, namespace)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/EGG-INFO/scripts/hg",
line 27, in <module>
    mercurial.dispatch.run()
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 16, in run
    sys.exit(dispatch(sys.argv[1:]))
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 34, in dispatch
    return _runcatch(u, args)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 54, in _runcatch
    return _dispatch(ui, args)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 483, in _dispatch
    cmdpats, cmdoptions)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 351, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/extensions.py",
line 160, in wrap
    return wrapper(origfn, *args, **kwargs)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/color.py",
line 213, in colorcmd
    return orig(ui_, opts, cmd, cmdfunc)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 534, in _runcommand
    return checkargs()
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 488, in checkargs
    return cmdfunc()
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/dispatch.py",
line 481, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **cmdoptions)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/util.py",
line 420, in check
    return func(*args, **kwargs)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/rebase.py",
line 167, in rebase
    newrev = concludenode(repo, rev, p1, p2, extrafn=extrafn)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/rebase.py",
line 282, in concludenode
    date=ctx.date(), extra=extra)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/mq.py",
line 2690, in commit
    editor, extra)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 893, in commit
    ret = self.commitctx(cctx, True)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/hgext/bookmarks.py",
line 282, in commitctx
    node  = super(bookmark_repo, self).commitctx(ctx, error)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 940, in commitctx
    changed)
  File
"/usr/local/lib/python2.6/dist-packages/mercurial-1.6-py2.6-linux-x86_64.egg/mercurial/localrepo.py",
line 763, in _filecommit
    self.ui.debug(" %s: copy %s:%s\n" % (fname, cfname, hex(crev)))
TypeError: b2a_hex() argument 1 must be string or read-only buffer, not None

----------
messages: 13226
nosy: mweil
priority: urgent
status: unread
title: Stack trace and crash when rebasing with moved files

____________________________________________________
Mercurial issue tracker <bugs at mercurial.selenic.com>
<http://mercurial.selenic.com/bts/issue2304>
____________________________________________________