1463195 - bzexport fails with mercurial 4.6

Status: RESOLVED FIXED

(Developer Services :: Mercurial: bzexport, defect)

Description

[Jonathan Kew [:jfkthame]]

With mercurial 4.6 and up-to-date https://hg.mozilla.org/hgcustom/version-control-tools, bzexport fails:

$ hg bzexport
** Unknown exception encountered with possibly-broken third-party extension bzexport
** which supports versions 4.2 of Mercurial.
** Please disable bzexport and try your action again.
** If that fixes the bug please report it to https://bugzilla.mozilla.org/enter_bug.cgi?product=Developer%20Services&component=Mercurial%3A%20bzexport
** Python 2.7.15 (default, May  1 2018, 16:44:08) [GCC 4.2.1 Compatible Apple LLVM 9.1.0 (clang-902.0.39.1)]
** Mercurial Distributed SCM (version 4.6)
** Extensions loaded: strip, mq, transplant, graphlog, histedit, rebase, evolve, fsmonitor, blackbox, firefoxtree, bzexport, push-to-try
Traceback (most recent call last):
  File "/usr/local/bin/hg", line 41, in <module>
    dispatch.run()
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 90, in run
    status = (dispatch(req) or 0)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 210, in dispatch
    ret = _runcatch(req)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 351, in _runcatch
    return _callcatch(ui, _runcatchfunc)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 359, in _callcatch
    return scmutil.callcatch(ui, func)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/scmutil.py", line 160, in callcatch
    return func()
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 341, in _runcatchfunc
    return _dispatch(req)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 971, in _dispatch
    cmdpats, cmdoptions)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 727, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 979, in _runcommand
    return cmdfunc()
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/dispatch.py", line 968, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/hgext/mq.py", line 3599, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File "/usr/local/Cellar/mercurial/4.6/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/Users/jkew/.mozbuild/version-control-tools/hgext/bzexport/__init__.py", line 1022, in bzexport
    cmdutil.export(repo, [ctx.hex()], fp=contents, opts=diffopts)
TypeError: export() got an unexpected keyword argument 'fp'

Comment 1

[Jonathan Kew [:jfkthame]]

BTW, note that mach bootstrap (at least on macOS) now installs mercurial 4.6, and therefore results in a broken bzexport. I had to manually downgrade mercurial to get a working bzexport back.

Comment 2

[Phabricator Automation]

Attachment: bzexport: change cmdutil.export to cmdutil.exportfile (Bug 1463195) r?gps

Mercurial 4.6 has removed the keyword argument `fp` from the
cmdutil.export command and replaced it with a cmdutil.exportfile
command. We try and use the old command and swap to the new version
if that fails.

Comment 3

[Phabricator Automation]

Attachment: bzexport: register config items (Bug 1463195) r?gps

This removes the devel-warn messages from tests

Comment 4

[Phabricator Automation]

Attachment: mozhg: use error.Abort instead of util.Abort (Bug 1463195) r?gps

bzexport uses mozhg, which hasn't been updated to use the new
APIs.

Comment 5

[Phabricator Automation]

Attachment: bzexport: fix use of deprecated APIs (Bug 1463195) r?gps

This commits wraps uses of deprecated APIs in try/except
blocks. Tests are almost back to passing, with the exception
of a failure in all tests with shutting down the docker
container for BMO and an intermittent in test-basechange.t

Comment 6

[Phabricator Automation]

Attachment: bzexport: update supported versions (Bug 1463195) r?gps

Comment 7

[Phabricator Automation]

Comment on attachment 8980027 [details]
mozhg: use error.Abort instead of util.Abort (Bug 1463195) r?gps

Gregory Szorc [:gps] has approved the revision.

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

Comment 8

[Phabricator Automation]

Comment on attachment 8980029 [details]
bzexport: update supported versions (Bug 1463195) r?gps

Gregory Szorc [:gps] has approved the revision.

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

Comment 9

[Phabricator Automation]

Comment on attachment 8980025 [details]
bzexport: change cmdutil.export to cmdutil.exportfile (Bug 1463195) r?gps

Gregory Szorc [:gps] has approved the revision.

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

Comment 10

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/888c1be64816
bzexport: change cmdutil.export to cmdutil.exportfile r=gps

Comment 11

[Phabricator Automation]

Comment on attachment 8980026 [details]
bzexport: register config items (Bug 1463195) r?gps

Gregory Szorc [:gps] has approved the revision.

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

Comment 12

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/68ba75a365d0
bzexport: register config items r=gps

Comment 13

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/a47dc2bafeea
mozhg: use error.Abort instead of util.Abort r=gps

Comment 14

[Phabricator Automation]

Comment on attachment 8980028 [details]
bzexport: fix use of deprecated APIs (Bug 1463195) r?gps

Gregory Szorc [:gps] has approved the revision.

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

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/5c0e8a7b4202
bzexport: fix use of deprecated APIs r=gps

Comment 16

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/44c87c5629e7
bzexport: update supported versions r=gps

Comment 17

[Brian Birtles (:birtles, Feb 26~ parental leave)]

I now get the following error on Windows when running just about any mercurial command:

> *** failed to import extension bzexport from c:\Users\Brian\.mozbuild\version-control-tools\hgext\bzexport: No module named mozhg.util

Running ./mach bootstrap doesn't seem to help. (And I had to install VC for Python just to get that to even work since otherwise it couldn't update Mercurial. But that's another bug I guess.)

Comment 18

[Brian Birtles (:birtles, Feb 26~ parental leave)]

And now I got spammed 5 emails from Phabricator just because I replied to this bug.

Comment 19

[Brian Birtles (:birtles, Feb 26~ parental leave)]

I'm starting to suspect that upgrading MozillaBuild just messed up Python somehow.

Comment 20

[Gregory Szorc [:gps]]

Are you using the latest changeset from version-control-tools? We introduced a Windows-only issue earlier this week and fixed it a few hours ago in bug 1467428.

Comment 21

[Brian Birtles (:birtles, Feb 26~ parental leave)]

Yes, I just ran ./mach bootstrap and then pulled it manually to be sure.

I notice when I run `hg qref` a bunch of the other extensions are broken (qimportbz, qbackout, mqext, push-to-try etc.).

Either a lot of extensions are broken on Windows or my setup is broken. I'm starting to suspect the latter although I haven't made any changes to it recently except upgrading MozillaBuild.

Comment 22

[Brian Birtles (:birtles, Feb 26~ parental leave)]

For what it's worth I also get:

> *** failed to import extension evolve from C:\Users\Brian\appdata\Roaming\Python\Python27\site-packages\hgext3rd\evolve: No module named wireproto

(And we really need to fix the defaults for these Phabricator emails.)

Comment 23

[Nils Ohlmeier [:drno]]

(In reply to Brian Birtles (:birtles) from comment #17)
> I now get the following error on Windows when running just about any
> mercurial command:
> 
> > *** failed to import extension bzexport from c:\Users\Brian\.mozbuild\version-control-tools\hgext\bzexport: No module named mozhg.util

Ran into the same error message. The patch for this looks like this:

--- a/hgext/bzexport/__init__.py
+++ b/hgext/bzexport/__init__.py
@@ -63,21 +63,21 @@ from mercurial import (
     patch,
     registrar,
     revset,
     scmutil,
     util,
 )
 from hgext import mq
 
-from mozhg.util import import_module
-
 OUR_DIR = os.path.dirname(__file__)
 execfile(os.path.join(OUR_DIR, '..', 'bootstrap.py'))
 
+from mozhg.util import import_module
+
 import bzauth
 import bz
 from mozautomation.commitparser import BUG_RE
 from mozhg.rewrite import newparents, replacechangesets
 
 testedwith = '4.2 4.3 4.4 4.5 4.6'
 minimumhgversion = '4.2'
 buglink = 'https://bugzilla.mozilla.org/enter_bug.cgi?product=Developer%20Services&component=Mercurial%

Comment 24

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c647a2b0a442
bzexport: don't attempt to import mozhg before sys.path adjustment

Comment 25

[Connor Sheehan [:sheehan]]

Are you still having issues :birtles? It looks like c647a2b0a442 in version-control-tools may have solved this issue, but I never followed up. Apologies!

Comment 26

[Brian Birtles (:birtles, Feb 26~ parental leave)]

It seems to have fixed it for bzexport but not for the other extensions like qimportbz, qbackout, push-to-try, and mqext.