1427019 - fastannotate doesn't work with Mercurial 4.4

Status: RESOLVED DUPLICATE of bug 1504794

(Developer Services :: Mercurial: hg.mozilla.org, defect)

Description

[Masatoshi Kimura [:emk]]

For example: https://hg.mozilla.org/experimental/mozilla-central-cvs/annotate/tip/netwerk/streamconv/converters/mozTXTToHTMLConv.cpp

This makes CVS archeology impossible.

Comment 1

[Gregory Szorc [:gps]]

[Sat Jan 06 00:25:40.815003 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928] mod_wsgi (pid=18394): Exception occurred processing WSGI script '/repo_local/mozilla/webroot_wsgi/experimental/hgweb.wsgi'.
[Sat Jan 06 00:25:40.815058 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928] Traceback (most recent call last):
[Sat Jan 06 00:25:40.815072 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/hgweb/hgwebdir_mod.py", line 227, in run_wsgi
[Sat Jan 06 00:25:40.815122 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for r in self._runwsgi(req):
[Sat Jan 06 00:25:40.815144 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/hgweb/hgweb_mod.py", line 324, in run_wsgi
[Sat Jan 06 00:25:40.815272 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for r in self._runwsgi(req, repo):
[Sat Jan 06 00:25:40.815283 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/version-control-tools/hgext/serverlog/__init__.py", line 272, in _runwsgi
[Sat Jan 06 00:25:40.815300 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for what in super(hgwebwrapped, self)._runwsgi(req, repo):
[Sat Jan 06 00:25:40.815308 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/util.py", line 1005, in increasingchunks
[Sat Jan 06 00:25:40.815735 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for chunk in source:
[Sat Jan 06 00:25:40.815745 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/templater.py", line 1263, in _flatten
[Sat Jan 06 00:25:40.816132 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for j in _flatten(i):
[Sat Jan 06 00:25:40.816147 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/templater.py", line 1254, in _flatten
[Sat Jan 06 00:25:40.816177 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for i in thing:
[Sat Jan 06 00:25:40.816185 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/templater.py", line 456, in runmap
[Sat Jan 06 00:25:40.816193 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     for i, v in enumerate(diter):
[Sat Jan 06 00:25:40.816198 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]   File "/var/hg/venv_hgweb/lib/python2.7/site-packages/mercurial/hgweb/webcommands.py", line 906, in annotate
[Sat Jan 06 00:25:40.816381 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928]     lines = webutil.annotate(req, fctx, web.repo.ui)
[Sat Jan 06 00:25:40.816399 2018] [wsgi:error] [pid 18394] [remote 10.22.74.210:25928] TypeError: _hgwebannotate() takes exactly 3 arguments (4 given)

Likely regression from upgrading to Mercurial 4.4 (or 4.3 since we did the upgrades a day or two apart).

Comment 2

[Gregory Szorc [:gps]]

I disabled the fastannotate extension on this repo and annotate is working again (albeit slower than it would be if fastannotate were enabled).

So this is obviously a compatibility issue between fastannotate and Mercurial 4.4 :/

Comment 3

[Gregory Szorc [:gps]]

Mercurial 4.8 ships with fastannotate and we switched to that in bug 1504794.

fastannotate is currently enabled for https://hg.mozilla.org/experimental/mozilla-central-cvs/ only. Although we may enable it more broadly as the feature stabilizes and as people request it.