1385979 - Upgrade hg.mozilla.org to Mercurial 4.2 (hgssh)

Status: RESOLVED FIXED

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

Description

[Gregory Szorc [:gps]]

We never upgraded hgssh to Mercurial 4.2. Let's get that done.

Comment 1

[Gregory Szorc [:gps]]

I'm still piecing patches together. The test environment isn't in a happy state and there appears to be some behavioral changes with the upgrade and I need to be sure tests are happy. This is what happens when we don't pay down technical debt with automated testing :/

Comment 2

[Gregory Szorc [:gps]]

Attachment: testing: check for mysqld process when waiting for server

On my machine, mysqld dies shortly after startup. The current code
attempts connections for many seconds before timing out. We have
a handle on the mysqld process. So let's verify it is running and
abort if it goes away.

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

Comment 3

[Gregory Szorc [:gps]]

Attachment: testing: touch MySQL files when starting bmoweb container

See the inline comment for rationale. So hacky.

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

Comment 4

[Gregory Szorc [:gps]]

Attachment: reviewboard: support calling showlist() with Mercurial 4.2 (bug 1385979);

The prototype of templatekw.showlist() changed in Mercurial 4.2.
While I normally try to call one form and fall back on TypeError,
the use of **kwargs in the old form makes this difficult. So we
use inspect.getargspec() to see what arguments it expects.

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

Comment 5

[Gregory Szorc [:gps]]

Attachment: reviewboard: update tests with current output

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

Comment 6

[Gregory Szorc [:gps]]

Attachment: autoland: update test output to match current;

This regressed recently in 941cdd5b6e13.

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

Comment 7

[Gregory Szorc [:gps]]

Attachment: bzexport: prefer using non-MQ export mechanism;

ce9d0ea7995e changed the code to use MQ's mechanisms for exporting
a revision. This broke tests. Specifically, the User field was
dropped from the attachment output. This feels like an undesirable
change.

We refactor the code to prefer the built-in changeset exporting
machanism. We still preserve the ability to query a revset.

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

Comment 8

[Gregory Szorc [:gps]]

Attachment: bzexport: fix failing test

The revset was rename from "basechange" to "bzbasechange" during
development. It appears the test never reflected this rename.

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

Comment 9

[Gregory Szorc [:gps]]

Attachment: global: upgrade all Mercurial 4.2 installs to 4.2.2 (bug 1385979);

We should be running the latest Mercurial release.

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

Comment 10

[Gregory Szorc [:gps]]

Attachment: testing: install Mercurial 4.2.2 in testing environment (1385979);

We should be installing the latest stable release so we test against it.

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

Comment 11

[Gregory Szorc [:gps]]

Attachment: testing: upgrade Mercurial in main virtualenv to 4.2 (bug 1385979);

The local virtualenv should be running the latest Mercurial release.

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

Comment 12

[Gregory Szorc [:gps]]

Attachment: git: set ui.promptecho in test;

Modern versions of Mercurial need this set so input received from
ui.prompt() is printed back out. Without this, test output
changes on modern versions of Mercurial.

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

Comment 13

[Gregory Szorc [:gps]]

Attachment: git: update test output to reflect reality;

At some point, a Mercurial or git-cinnabar change caused git-cinnabar to
stop printing "remote: " prefixes on data originated from remotes.

Where this bug resides, I'm not sure. git-mozreview is dead code
walking. I'm inclined to just accept the test output change and
move on. I've already made glandium aware of the potential issue
in case the bug is in cinnabar.

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

Comment 14

[Gregory Szorc [:gps]]

Attachment: ansible/hg-web: upgrade all Mercurial packages to 4.2.2 (bug 1385979);

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

Comment 15

[Gregory Szorc [:gps]]

I'm still working on this. But there's enough here to start reviewing.

A test failure after upgrade led me to discover https://bz.mercurial-scm.org/show_bug.cgi?id=5648. It took me a while to realize this was a Mercurial bug, ugh.

Comment 16

[:glob ✱]

Comment on attachment 8893173 [details]
reviewboard: support calling showlist() with Mercurial 4.2 (bug 1385979);

https://reviewboard.mozilla.org/r/164182/#review169588

Comment 17

[:glob ✱]

Comment on attachment 8893175 [details]
autoland: update test output to match current;

https://reviewboard.mozilla.org/r/164186/#review169594

Comment 18

[:glob ✱]

Comment on attachment 8893176 [details]
bzexport: prefer using non-MQ export mechanism;

https://reviewboard.mozilla.org/r/164188/#review169596

Comment 19

[:glob ✱]

Comment on attachment 8893178 [details]
global: upgrade all Mercurial 4.2 installs to 4.2.2 (bug 1385979);

https://reviewboard.mozilla.org/r/164192/#review169598

Comment 20

[:glob ✱]

Comment on attachment 8893179 [details]
testing: install Mercurial 4.2.2 in testing environment (1385979);

https://reviewboard.mozilla.org/r/164194/#review169600

Comment 21

[:glob ✱]

Comment on attachment 8893180 [details]
testing: upgrade Mercurial in main virtualenv to 4.2 (bug 1385979);

https://reviewboard.mozilla.org/r/164196/#review169602

Comment 22

[:glob ✱]

Comment on attachment 8893181 [details]
git: set ui.promptecho in test;

https://reviewboard.mozilla.org/r/164198/#review169604

Comment 23

[:glob ✱]

Comment on attachment 8893182 [details]
git: update test output to reflect reality;

https://reviewboard.mozilla.org/r/164200/#review169606

Comment 24

[:glob ✱]

Comment on attachment 8893183 [details]
ansible/hg-web: upgrade all Mercurial packages to 4.2.2 (bug 1385979);

https://reviewboard.mozilla.org/r/164202/#review169608

Comment 25

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/eea1197bbf6c
reviewboard: support calling showlist() with Mercurial 4.2 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/a813aae845c9
global: upgrade all Mercurial 4.2 installs to 4.2.2 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/66cec64dfe0c
testing: install Mercurial 4.2.2 in testing environment ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/1c516f4943d5
testing: upgrade Mercurial in main virtualenv to 4.2.2 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/da574938ae1e
ansible/hg-web: upgrade all Mercurial packages to 4.2.2 ; r=glob
https://hg.mozilla.org/hgcustom/version-control-tools/rev/aaaf8ac5c695
ansible/hg-ssh: upgrade all Mercurial packages to 4.2.2 
https://hg.mozilla.org/hgcustom/version-control-tools/rev/c6638e55e3cc
ansible: install Mercurial 4.2.2 in mercurial-yum role

Comment 26

[Gregory Szorc [:gps]]

Since glob won't be around for the rest of the week, I went ahead and finished the series via self-review.

Changes have been deployed and we're now running 4.2.2 everywhere on hg.mozilla.org.