Attachment 183910 Details for Bug 220357 – Backtrace during hg update

Backtrace during hg update

breakage (text/plain), 3.61 KB, created by Domagoj Stolfa on 2017-06-29 12:53:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Domagoj Stolfa

Created: 2017-06-29 12:53:51 UTC

Size: 3.61 KB

patch

obsolete

>** Unknown exception encountered with possibly-broken third-party extension hggit
>** which supports versions 3.9 of Mercurial.
>** Please disable hggit and try your action again.
>** If that fixes the bug please report it to https://bitbucket.org/durin42/hg-git/issues
>** Python 2.7.13 (default, Jun  8 2017, 01:41:12) [GCC 4.2.1 Compatible FreeBSD Clang 4.0.0 (tags/RELEASE_400/final 297347)]
>** Mercurial Distributed SCM (version 4.2.1)
>** Extensions loaded: evolve, hggit, rebase, convert
>Traceback (most recent call last):
>  File "/usr/local/bin/hg", line 45, in <module>
>    mercurial.dispatch.run()
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 83, in run
>    status = (dispatch(req) or 0) & 255
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 164, in dispatch
>    ret = _runcatch(req)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 295, in _runcatch
>    return _callcatch(ui, _runcatchfunc)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 303, in _callcatch
>    return scmutil.callcatch(ui, func)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/scmutil.py", line 146, in callcatch
>    return func()
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 285, in _runcatchfunc
>    return _dispatch(req)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 912, in _dispatch
>    cmdpats, cmdoptions)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 648, in runcommand
>    ret = _runcommand(ui, options, cmd, d)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 920, in _runcommand
>    return cmdfunc()
>  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 909, in <lambda>
>    d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1080, in check
>    return func(*args, **kwargs)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/extensions.py", line 231, in closure
>    return func(*(args + a), **kw)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1080, in check
>    return func(*args, **kwargs)
>  File "/home/dstolfa/.local/lib/python2.7/site-packages/hgext3rd/evolve/__init__.py", line 678, in wrapmayobsoletewc
>    res = origfn(ui, repo, *args, **opts)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1080, in check
>    return func(*args, **kwargs)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/commands.py", line 5409, in update
>    updatecheck=updatecheck)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/hg.py", line 766, in updatetotally
>    ret = _update(repo, checkout, updatecheck=updatecheck)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/hg.py", line 703, in update
>    stats = updaterepo(repo, node, False, updatecheck=updatecheck)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/hg.py", line 699, in updaterepo
>    updatecheck=updatecheck)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 1601, in update
>    followcopies, matcher=matcher, mergeforce=mergeforce)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 962, in calculateupdates
>    acceptremote, followcopies)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/merge.py", line 824, in manifestmerge
>    diff = m1.diff(m2, match=matcher)
>  File "/usr/local/lib/python2.7/site-packages/mercurial/extensions.py", line 231, in closure
>    return func(*(args + a), **kw)
>TypeError: wrapmanifestdictdiff() got an unexpected keyword argument 'match'
>

Actions: View

Attachments on bug 220357: 183910