Gregory Szorc [:gps] Reporter
	Description • 6 years ago

Mercurial 4.6's release is still a way's off. But already a number of extensions have broken due to upstream changes. Time to get a tracking bug up.

	Gregory Szorc [:gps] Reporter
	Comment 1 • 6 years ago

There are 18 patches in the stack at https://phabricator.services.mozilla.com/D1099 to add 4.6 compatibility to various extensions. Far from a complete effort. But a reasonable start.

	:glob ✱
	Comment 2 • 6 years ago

some more 4.6 issues:

Traceback (most recent call last):
  File "/usr/local/lib/python2.7/site-packages/mercurial/extensions.py", line 215, in _runextsetup
    extsetup(ui)
  File "/Users/byron/.mozbuild/version-control-tools/hgext/qimportbz/__init__.py", line 212, in extsetup
    'bz': bzhandler.Handler,
  File "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py", line 145, in __getattr__
    self._load()
  File "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py", line 90, in _load
    mod = _hgextimport(_origimport, head, globals, locals, None, level)
  File "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py", line 41, in _hgextimport
    return importfunc(name, globals, *args, **kwargs)
  File "/Users/byron/.mozbuild/version-control-tools/hgext/qimportbz/bzhandler.py", line 10, in <module>
    from mercurial.util import Abort
ImportError: cannot import name Abort

Traceback (most recent call last):
  File "/usr/local/lib/python2.7/site-packages/mercurial/extensions.py", line 215, in _runextsetup
    extsetup(ui)
  File "/Users/byron/.mozbuild/version-control-tools/hgext/mozext/__init__.py", line 1393, in extsetup
    templater.funcs['dates'] = template_dates
  File "/usr/local/lib/python2.7/site-packages/hgdemandimport/demandimportpy2.py", line 146, in __getattr__
    return getattr(self._module, attr)
AttributeError: 'module' object has no attribute 'funcs'

	:glob ✱
	Comment 3 • 6 years ago

Traceback (most recent call last):
  File "/usr/local/bin/hg", line 41, in <module>
    dispatch.run()
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 90, in run
    status = (dispatch(req) or 0)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 210, in dispatch
    ret = _runcatch(req)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 351, in _runcatch
    return _callcatch(ui, _runcatchfunc)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 359, in _callcatch
    return scmutil.callcatch(ui, func)
  File "/usr/local/lib/python2.7/site-packages/mercurial/scmutil.py", line 160, in callcatch
    return func()
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 341, in _runcatchfunc
    return _dispatch(req)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 971, in _dispatch
    cmdpats, cmdoptions)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 727, in runcommand
    ret = _runcommand(ui, options, cmd, d)
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 979, in _runcommand
    return cmdfunc()
  File "/usr/local/lib/python2.7/site-packages/mercurial/dispatch.py", line 968, in <lambda>
    d = lambda: util.checksignature(func)(ui, *args, **strcmdopt)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/Users/byron/.mozbuild/version-control-tools/hgext/firefoxtree/__init__.py", line 516, in pullcommand
    return orig(ui, repo, source=source, **opts)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hgext/mq.py", line 3599, in mqcommand
    return orig(ui, repo, *args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hgext3rd/evolve/__init__.py", line 793, in warnobserrors
    return orig(ui, repo, *args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hgext3rd/evolve/__init__.py", line 769, in wrapmayobsoletewc
    res = origfn(ui, repo, *args, **opts)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hgext/rebase.py", line 1766, in pullrebase
    ret = orig(ui, repo, *args, **opts)
  File "/usr/local/lib/python2.7/site-packages/mercurial/util.py", line 1553, in check
    return func(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/commands.py", line 4060, in pull
    opargs=pullopargs).cgresult
  File "/Users/byron/.mozbuild/version-control-tools/hgext/mozext/__init__.py", line 824, in pull
    res = orig(repo, remote, *args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hggit/util.py", line 56, in inner
    return f(*args, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/hggit/__init__.py", line 368, in exchangepull
    return orig(repo, remote, heads, force, bookmarks=bookmarks, **kwargs)
  File "/usr/local/lib/python2.7/site-packages/mercurial/exchange.py", line 1493, in pull
    _pullobsolete(pullop)
  File "/Users/byron/.mozbuild/version-control-tools/hgext/mozext/__init__.py", line 434, in exchangepullpushlog
    if isinstance(pullop.remote, sshpeer.sshpeer):
AttributeError: 'module' object has no attribute 'sshpeer'

	Phabricator Automation
	Comment 4 • 6 years ago

Tests are passing with no other changes, so mark as compatible.
It appears this extension was written with 4.6 compatibility
in mind (there were already a few "TRACKING hg46" comments inline).

	Phabricator Automation
	Comment 5 • 6 years ago

Comment on attachment 8987114 [details]
replicateowner: mark as compatible with Mercurial 4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 6 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/9133118bda57
replicateowner: mark as compatible with Mercurial 4.6 r=gps

	Connor Sheehan [:sheehan] Assignee
	Comment 7 • 6 years ago

The only breaking change here is the wireproto module renaming.
So we add an `import_module` call and mark as testedwith 4.6
everywhere.

	Phabricator Automation
	Comment 8 • 6 years ago

Comment on attachment 8992350 [details]
vcsreplicator: make extensions compatible with Mercurial 4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 9 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/afa157e32d6d
vcsreplicator: make extensions compatible with Mercurial 4.6 r=gps

	Gregory Szorc [:gps] Reporter
	Comment 10 • 6 years ago

The wire protocol code changed substantially in 4.6. This required
a number of conditional checks throughout the extension.

It's worth noting that we now record the response size for all HTTP
requests. This is because prior to 4.6, some HTTP handlers were using
the legacy request.write() API to send response bytes. This extension
isn't monitoring this API. Post 4.6, all I/O is performed via a
generator, which is monitored.

	Phabricator Automation
	Comment 11 • 6 years ago

Comment on attachment 8993085 [details]
serverlog: port to Mercurial 4.6; r?sheehan

Connor Sheehan [:sheehan] has approved the revision.

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

	Pulsebot
	Comment 12 • 6 years ago

Pushed by cosheehan@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/e9484bed264f
serverlog: port to Mercurial 4.6; r=sheehan

	Connor Sheehan [:sheehan] Assignee
	Comment 13 • 6 years ago

I overlooked running these new tests against 4.6.2 in bug 1470476.

	Connor Sheehan [:sheehan] Assignee
	Comment 14 • 6 years ago

The only breaking change here was moving `parsemeta` from
the `filelog` module to the `revlog` module.

	Connor Sheehan [:sheehan] Assignee
	Comment 15 • 6 years ago

No changes needed here, but I ran the tests against all the modern
Mercurial versions and they pass every time. Updating the
`testedwith` string accordingly.

	Phabricator Automation
	Comment 16 • 6 years ago

Comment on attachment 8993466 [details]
overlay: enable compatibility with Mercurial 4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 17 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/675fda2d88bf
overlay: enable compatibility with Mercurial 4.6 r=gps

	Phabricator Automation
	Comment 18 • 6 years ago

Comment on attachment 8993469 [details]
manualoverlay: mark as tested with modern Mercurials (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 19 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/3f15bc650cd1
manualoverlay: mark as tested with modern Mercurials r=gps

	Connor Sheehan [:sheehan] Assignee
	Comment 20 • 6 years ago

No changes needed to get tests passing. Mark as tested under 4.5 and
4.6.

	Connor Sheehan [:sheehan] Assignee
	Comment 21 • 6 years ago

No changes needed for the test to pass. Marking as testedwith all
new Mercurial versions.

	Pulsebot
	Comment 22 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/95f5da465794
qbackout: mark as compatible with Mercurials 4.3-4.6 r=gps

	Pulsebot
	Comment 23 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/81af8dbbbe84
push-to-try: mark as compatible with Mercurial 4.5/4.6 r=gps

	Phabricator Automation
	Comment 24 • 6 years ago

Comment on attachment 8994273 [details]
qbackout: mark as compatible with Mercurials 4.3-4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 25 • 6 years ago

Comment on attachment 8994272 [details]
push-to-try: mark as compatible with Mercurial 4.5/4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Connor Sheehan [:sheehan] Assignee
	Comment 36 • 6 years ago

Since we are moving off of a patched Mercurial 4.5.3 and onto the
4.6.2 release, there is no reason to keep this virtualenv around.

	Phabricator Automation
	Comment 38 • 6 years ago

Comment on attachment 8996119 [details]
vcsreplicator: update test-served-heads.t to with Mercurial 4.6 test output (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 39 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/935ff848afce
vcsreplicator: update test-served-heads.t to with Mercurial 4.6 test output r=gps

	Phabricator Automation
	Comment 40 • 6 years ago

Comment on attachment 8996120 [details]
testing: upgrade Mercurial to 4.6.2 in hgdev test environment (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 41 • 6 years ago

Comment on attachment 8996121 [details]
testing: upgrade Mercurial to 4.6.2 in hgweb chroot builder virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 42 • 6 years ago

Comment on attachment 8996122 [details]
testing: upgrade Mercurial to 4.6.2 in docker-hgweb mozbuild virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 43 • 6 years ago

Comment on attachment 8996123 [details]
ansible: upgrade Mercurial to 4.6.2 in deployment virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 44 • 6 years ago

Comment on attachment 8996124 [details]
ansible: update Mercurial to 4.6.2 in replication virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 45 • 6 years ago

Comment on attachment 8996125 [details]
ansible: upgrade Mercurial to 4.6.2 in hgweb tools virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 46 • 6 years ago

Comment on attachment 8996126 [details]
ansible: upgrade Mercurial to 4.6.2 on hgweb (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 47 • 6 years ago

Comment on attachment 8996127 [details]
ansible: upgrade Mercurial to 4.6.2. in pash virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 48 • 6 years ago

Comment on attachment 8996129 [details]
ansible: remove pre-release Mercurial requirements file and Ansible task (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 49 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/bac9170e5c7e
ansible: remove pre-release Mercurial requirements file and Ansible task r=gps

	Phabricator Automation
	Comment 50 • 6 years ago

Comment on attachment 8996128 [details]
ansible: upgrade Mercurial to 4.6.2 in hgssh tools virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 51 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/39d61310353d
vcssync: upgrade Mercurial to 4.6.2 in vcssync virtualenv r?gps

	Phabricator Automation
	Comment 52 • 6 years ago

Comment on attachment 8996130 [details]
vcssync: upgrade Mercurial to 4.6.2 in vcssync virtualenv (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 53 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/abb138458501
testing: upgrade Mercurial to 4.6.2 in hgdev test environment r=gps

	Pulsebot
	Comment 54 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/661a49bd5af5
testing: upgrade Mercurial to 4.6.2 in hgweb chroot builder virtualenv r=gps

	Pulsebot
	Comment 55 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c22ad816c093
testing: upgrade Mercurial to 4.6.2 in docker-hgweb mozbuild virtualenv r=gps

	Pulsebot
	Comment 56 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/241404052377
ansible: upgrade Mercurial to 4.6.2 in deployment virtualenv r=gps

	Pulsebot
	Comment 57 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/83c3098574a2
ansible: upgrade Mercurial to 4.6.2. in pash virtualenv r=gps
https://hg.mozilla.org/hgcustom/version-control-tools/rev/92f318ef1e1d
ansible: upgrade Mercurial to 4.6.2 in hgssh tools virtualenv r=gps

	Pulsebot
	Comment 58 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/031820683403
ansible: update Mercurial to 4.6.2 in replication virtualenv r=gps

	Pulsebot
	Comment 59 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/52972f4f135f
ansible: upgrade Mercurial to 4.6.2 in hgweb tools virtualenv r=gps

	Connor Sheehan [:sheehan] Assignee
	Comment 60 • 6 years ago

This commit contains the patch series generated by
`hgtemplates/.patches/mozify-templates.py` squashed into a
single commit. Also included are updates to the vendored
`gitweb` theme from upstream Mercurial 4.6.2, and a fix
to `test-template-sync.t` to reflect the new output
when applying the patches.

	Phabricator Automation
	Comment 61 • 6 years ago

Comment on attachment 8996156 [details]
hgtemplates: upgrade templates for Mercurial 4.6.2 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 62 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/ac47e33ad4c2
ansible: upgrade Mercurial to 4.6.2 on hgweb r=gps

	Pulsebot
	Comment 63 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/958dc5e4168c
hgtemplates: upgrade templates for Mercurial 4.6.2 r=gps

	Connor Sheehan [:sheehan] Assignee
	Comment 64 • 6 years ago

All of the servers behind hg.mozilla.org are now running Mercurial 4.6 (with the exception of reviewboard which was ignored since it is reaching its EOL). It looks like everything with the upgrade went smoothly. Closing this bug as resolved, we can re-open in the case something is broken or something was overlooked.

	Connor Sheehan [:sheehan] Assignee
	Comment 65 • 6 years ago

We still need to update the clients in CI. Re-opening.

	Connor Sheehan [:sheehan] Assignee
	Comment 67 • 6 years ago

This commit points the `install_mercurial.sh` script at the
newest Mercurial distributions uploaded to tooltool.

	Phabricator Automation
	Comment 68 • 6 years ago

Comment on attachment 8996838 [details]
Bug 1446453: install Mercurial 4.7 in Non-Debian Linux Docker images r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Phabricator Automation
	Comment 69 • 6 years ago

Comment on attachment 8996830 [details]
Bug 1446453: upgrade Mercurial clients to 4.7 in Debian based Docker images r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Connor Sheehan [:sheehan] Assignee
	Comment 70 • 6 years ago

Since Mercurial 4.7 is out, we're going to upgrade the clients directly to the newer version. Closing this bug.

	Phabricator Automation
	Comment 71 • 6 years ago

Comment on attachment 8996830 [details]
Bug 1446453: upgrade Mercurial clients to 4.7 in Debian based Docker images r?gps

Gregory Szorc [:gps] has requested changes to the revision.

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

	Phabricator Automation
	Comment 72 • 6 years ago

Comment on attachment 8996830 [details]
Bug 1446453: upgrade Mercurial clients to 4.7 in Debian based Docker images r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 73 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/integration/autoland/rev/cff1fa17db28
upgrade Mercurial clients to 4.7 in Debian based Docker images; r=gps
https://hg.mozilla.org/integration/autoland/rev/3f6acd9e4954
install Mercurial 4.7 in Non-Debian Linux Docker images; r=gps

	Bogdan Tara[:bogdan_tara | bogdant]
	Comment 74 • 6 years ago
bugherder

https://hg.mozilla.org/mozilla-central/rev/cff1fa17db28
https://hg.mozilla.org/mozilla-central/rev/3f6acd9e4954

	Connor Sheehan [:sheehan] Assignee
	Comment 75 • 6 years ago

We forgot to do this during the 4.6 upgrade and some
output about incompatible Mercurial versions is present
in the bootstrap output logs.

	Phabricator Automation
	Comment 76 • 6 years ago

Comment on attachment 8998348 [details]
serverlog: mark as compatible with Mercurial 4.6 (Bug 1446453) r?gps

Gregory Szorc [:gps] has approved the revision.

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

	Pulsebot
	Comment 77 • 6 years ago

Pushed by gszorc@mozilla.com:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/ea003aefc061
serverlog: mark as compatible with Mercurial 4.6 r=gps

	Tom Prince [:tomprince]
	Comment 78 • 6 years ago
bugherder uplift

https://hg.mozilla.org/releases/mozilla-esr60/rev/d0f7a9c0073d
https://hg.mozilla.org/releases/mozilla-esr60/rev/d4e0e944c78a