1361182 - Update extensions for Mercurial 4.2 compatibility

Status: RESOLVED FIXED

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

Description

[Gregory Szorc [:gps]]

Mercurial 4.2 will be released very shortly. We should mark all extensions as compatible (and fix any bugs that arise of course).

Comment 1

[Gregory Szorc [:gps]]

Attachment: testing: extract hg path to a variable;

This will make a subsequent diff easier to read. It also makes this
code more intelligible, IMO.

Review commit: https://reviewboard.mozilla.org/r/135326/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135326/

Comment 2

[Gregory Szorc [:gps]]

Attachment: testing: always set HGVERSION to resolved Mercurial version;

Previously, the "version" variable was the literal directory name. In
most cases, this should match exactly to the version reported by
`hg --version`. However, in the case of the "@" directory, the
version would be "@" which is nonsense.

We already have a helper function to resolve the Mercurial version
given an hg executable. So we plug that in to populate HGVERSION
with the actual version.

Review commit: https://reviewboard.mozilla.org/r/135328/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135328/

Comment 3

[Gregory Szorc [:gps]]

Attachment: testing: add capability for Mercurial 4.2+ (bug 1361182);

We add one of these for every version we support so we can
conditionalize test execution.

Review commit: https://reviewboard.mozilla.org/r/135330/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135330/

Comment 4

[Gregory Szorc [:gps]]

Attachment: pushlog: drop compatibility with old Mercurial versions (bug 1361182);

The pushlog extension only needs to run on servers. I'm not sure why we
claim support for older versions. Probably a cargo cult (on my part).

This is causing a problem with tests because tests load the hgmo
extension (which has dropped compatibility <4.1) and this results in a
warning being printed on <4.1 Mercurials, causing tests to fail.

So let's mark the extensions with the same compatibility as the hgmo
extension so the tests don't run anywhere the hgmo extension isn't
also compatible.

Review commit: https://reviewboard.mozilla.org/r/135332/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135332/

Comment 5

[Gregory Szorc [:gps]]

Attachment: reviewboard: mark test-errors.t as requiring Mercurial 4.1+;

As part of running tests against all Mercurial versions, this test was
failing on old versions because it attempts to load the server.py
extension, which requires 4.1. The code in run-tests that parses
extension compatibility out of "testedwith" variables normally
prevents this. However, since hgext/reviewboard/ has 2 extensions
and client.py lists compatibility with <4.1, it was getting picked
up.

All other tests don't need this #require because server.py runs in
Docker and Docker's Mercurial version is defined by the Docker
environment.

Review commit: https://reviewboard.mozilla.org/r/135334/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135334/

Comment 6

[Gregory Szorc [:gps]]

Attachment: pushlog: make test-strip.t compatible with Mercurial 4.2 (bug 1361182);

blackbox logging changed slightly in Mercurial 4.2. Adjust test output
accordingly.

We need to copy the hghave file into the test directory in order for the
#if to work. This is a limitation of Mercurial's test harness (it
requires an "hghave" executable next to the test file).

Review commit: https://reviewboard.mozilla.org/r/135336/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135336/

Comment 7

[Gregory Szorc [:gps]]

Attachment: hgext: mass upgrade extensions for Mercurial 4.2 compatibility (bug 1361182);

All extensions are now marked as compatibile with Mercurial 4.2.

As of this change, all non-Docker tests pass with both 4.1 and 4.2.

In some cases, the compatibility might be premature since Docker images
aren't yet running 4.2. I'm fine with that. We'll flush those out when
we upgrade the Docker images to 4.2.

Review commit: https://reviewboard.mozilla.org/r/135338/diff/#index_header
See other reviews: https://reviewboard.mozilla.org/r/135338/

Comment 8

[:glob ✱]

Comment on attachment 8863567 [details]
testing: extract hg path to a variable;

https://reviewboard.mozilla.org/r/135326/#review138284

Comment 9

[:glob ✱]

Comment on attachment 8863568 [details]
testing: always set HGVERSION to resolved Mercurial version;

https://reviewboard.mozilla.org/r/135328/#review138288

Comment 10

[:glob ✱]

Comment on attachment 8863569 [details]
testing: add capability for Mercurial 4.2+ (bug 1361182);

https://reviewboard.mozilla.org/r/135330/#review138290

Comment 11

[:glob ✱]

Comment on attachment 8863570 [details]
pushlog: drop compatibility with old Mercurial versions (bug 1361182);

https://reviewboard.mozilla.org/r/135332/#review138292

Comment 12

[:glob ✱]

Comment on attachment 8863571 [details]
reviewboard: mark test-errors.t as requiring Mercurial 4.1+;

https://reviewboard.mozilla.org/r/135334/#review138294

Comment 13

[:glob ✱]

Comment on attachment 8863572 [details]
pushlog: make test-strip.t compatible with Mercurial 4.2 (bug 1361182);

https://reviewboard.mozilla.org/r/135336/#review138296

Comment 14

[:glob ✱]

Comment on attachment 8863573 [details]
hgext: mass upgrade extensions for Mercurial 4.2 compatibility (bug 1361182);

https://reviewboard.mozilla.org/r/135338/#review138298

Comment 15

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/dba000b0d4e5
testing: add capability for Mercurial 4.2+ ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/91eca523b535
pushlog: drop compatibility with old Mercurial versions ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/10fe7adff928
pushlog: make test-strip.t compatible with Mercurial 4.2 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/53ce3454734d
hgext: mass upgrade extensions for Mercurial 4.2 compatibility ; r=glob