Failing with mercurial 4.6 (hggit inside)
For the record, when clicking on "Merge" after upgrading to mercurial 4.6
Could not publish merge changeset (but the merge was made!): pushing to git+ssh://git@localhost:nemo/doc.git error: pretxnclose hook raised an exception: __init__() got an unexpected keyword argument 'intents' **
Unknown exception encountered with possibly-broken third-party extension hggit ** which supports versions 4.5 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.12 (default,
Dec 4 2017, 14:50:18) [GCC 5.4.0 20160609] **
Mercurial
Distributed
SCM (version 4.6) **
Extensions loaded: hggit, evolve, topic
Traceback (most recent call last):
File "/usr/bin/hg", line 43, in <module> mercurial.dispatch.run()
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 90, in run status = (dispatch(req) or 0)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 210, in dispatch ret = _runcatch(req)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 351, in _runcatch return _callcatch(ui, _runcatchfunc)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 359, in _callcatch return scmutil.callcatch(ui, func)
File "/usr/local/lib/python2.7/dist-packages/mercurial/scmutil.py", line 160, in callcatch return func()
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 341, in _runcatchfunc return _dispatch(req)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 971, in _dispatch cmdpats, cmdoptions)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 727, in runcommand ret = _runcommand(ui, options, cmd, d)
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 979, in _runcommand return cmdfunc()
File "/usr/local/lib/python2.7/dist-packages/mercurial/dispatch.py", line 968, in <lambda> d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/hgext3rd/evolve/__init__.py", line 793, in warnobserrors return orig(ui, repo, *args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/commands.py", line 3910, in phase phases.retractboundary(repo, tr, targetphase, nodes)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1201, in __exit__ self.close()
File "/usr/local/lib/python2.7/dist-packages/mercurial/transaction.py", line 44, in _active return func(self, *args, **kwds)
File "/usr/local/lib/python2.7/dist-packages/mercurial/transaction.py", line 458, in close self.validator(self) # will raise exception if needed
File "/usr/local/lib/python2.7/dist-packages/mercurial/localrepo.py", line 1349, in validate txnname=desc, **pycompat.strkwargs(tr.hookargs))
File "/usr/local/lib/python2.7/dist-packages/mercurial/localrepo.py", line 922, in hook return hook.hook(self.ui, self, name, throw, **args)
File "/usr/local/lib/python2.7/dist-packages/mercurial/hook.py", line 210, in hook res = runhooks(ui, repo, htype, hooks, throw=throw, **args)
File "/usr/local/lib/python2.7/dist-packages/mercurial/hook.py", line 262, in runhooks throw)
File "/usr/local/lib/python2.7/dist-packages/mercurial/hook.py", line 98, in _pythonhook r = obj(ui=ui, repo=repo, hooktype=htype, **pycompat.strkwargs(args))
File "/assets/sync_hook.py", line 9, in mirror ret = push(ui, repo, dest=dest, force=True)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/hggit/__init__.py", line 386, in pushwrap return orig(ui, repo, dest, **opts)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/hgext3rd/topic/__init__.py", line 1129, in pushoutgoingwrap return orig(ui, repo, *args, **opts)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/hgext3rd/topic/flow.py", line 68, in wrappush return orig(repo, remote, *args, **newargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/hgext3rd/evolve/__init__.py", line 793, in warnobserrors return orig(ui, repo, *args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/util.py", line 1553, in check return func(*args, **kwargs)
File "/usr/local/lib/python2.7/dist-packages/mercurial/commands.py", line 4181, in push other = hg.peer(repo, opts, dest)
File "/usr/local/lib/python2.7/dist-packages/hggit/__init__.py", line 331, in peer newpeer = orig(uiorrepo, *args, **opts)
File "/usr/local/lib/python2.7/dist-packages/mercurial/hg.py", line 189, in peer return _peerorrepo(rui, path, create, intents=intents).peer()
File "/usr/local/lib/python2.7/dist-packages/mercurial/hg.py", line 163, in _peerorrepo obj = _peerlookup(path).instance(ui, path, create, intents=intents)
TypeError: __init__() got an unexpected keyword argument 'intents' .
@madprog tells me that a patch has been sent to hggit upstream
Downgrading to mercurial 4.5 solved the problem