1469046 - mqext breaks with 4.6

Status: RESOLVED FIXED

(Firefox Build System :: General, defect)

Description

[Chris Manchester (limited bugmail, email directly)]

Observed this week. The error points to push-to-try, but the stack ends in mqext.

$ hg qref
** Unknown exception encountered with possibly-broken third-party extension push-to-try
** which supports versions 4.4 of Mercurial.
** Please disable push-to-try and try your action again.
** If that fixes the bug please report it to the extension author.
** Python 2.7.12 (default, Dec  4 2017, 14:50:18) [GCC 5.4.0 20160609]
** Mercurial Distributed SCM (version 4.6)
** Extensions loaded: histedit, purge, rebase, strip, mq, reviewboard, push-to-try, firefoxtree, mqext
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 41, in <module>
    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 "/home/cmanchester/.mozbuild/version-control-tools/hgext/mqext/__init__.py", line 673, in qrefresh_wrapper
    cmdutil.diffordiffstat(self, repo, mdiff.diffopts(),
AttributeError: 'module' object has no attribute 'diffordiffstat'

Comment 1

[Connor Sheehan [:sheehan]]

Attachment: mqext: enable compatibility with Mercurial 4.6 (Bug 1469046) r?gps

There is only one test for the mqext extension, and it passes
with no changes. This commit updates the testedwith string and
adds logic to import the `diffordiffstat` function from the
right location. This should fix the error in the stack trace
from the bug description.

Comment 2

[Phabricator Automation]

Comment on attachment 8993880 [details]
mqext: enable compatibility with Mercurial 4.6 (Bug 1469046) r?gps

Gregory Szorc [:gps] has approved the revision.

https://phabricator.services.mozilla.com/D2287

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/6e10294b52ed
mqext: enable compatibility with Mercurial 4.6 r=gps